fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2017-11-22 11:33 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* contrib/rddads/ads1.c
  * src/rdd/workarea.c
    * generate RTE code when SELF_ADDFIELD() used in SELF_CREATEFIELDS()
      (dbCreate() backend) returns HB_FAILURE. It fixes silent dbCreate()
      exit when some wrong table structure arrays are passed to this
      function.

  * src/rdd/dbf1.c
    ! added protection against too long unicode character and fields defined
      in dbCreate() table structure array - fix problem reported by KevinC -
      thanks
    * change RTE number from EDBF_DATATYPE to EDBF_DATAWIDTH record size is
      exceed
    + added additional protection when corrupted table with unicode fields
      is open
This commit is contained in:
Przemysław Czerpak
2017-11-22 11:33:59 +01:00
parent dc0403d7dc
commit f960a5ccda
4 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/rdd/dbf1.c
View File

@@ -3246,15 +3246,17 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
switch( pField->uiType )
{
case HB_FT_STRING:
uiLen = pField->uiLen;
if( ( pField->uiFlags & HB_FF_UNICODE ) != 0 )
{
pThisField->bType = '\x1A';
uiLen <<= 1;
if( pField->uiLen > 32767 )
pField->uiLen = 32767;
uiLen = ( pField->uiLen << 1 );
}
else
{
pThisField->bType = 'C';
uiLen = pField->uiLen;
}
pThisField->bLen = ( HB_BYTE ) uiLen;
pThisField->bDec = ( HB_BYTE ) ( uiLen >> 8 );
@@ -3463,7 +3465,7 @@ static HB_ERRCODE hb_dbfCreate( DBFAREAP pArea, LPDBOPENINFO pCreateInfo )
}
if( pArea->pFieldOffset[ uiCount ] > pArea->uiRecordLen )
errSubCode = EDBF_DATATYPE;
errSubCode = EDBF_DATAWIDTH;
if( errSubCode != 0 )
break;
@@ -4124,7 +4126,7 @@ static HB_ERRCODE hb_dbfNewArea( DBFAREAP pArea )
static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo )
{
HB_ERRCODE errCode;
HB_USHORT uiFields, uiCount, uiSkip, uiDecimals, uiFlags, uiFlagsMask;
HB_USHORT uiFields, uiCount, uiSkip, uiDecimals, uiLen, uiFlags, uiFlagsMask;
HB_BOOL fRawBlob;
PHB_ITEM pError, pItem;
PHB_FNAME pFileName;
@@ -4611,13 +4613,19 @@ static HB_ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo )
case '\x1A':
dbFieldInfo.uiType = HB_FT_STRING;
dbFieldInfo.uiFlags |= HB_FF_UNICODE;
dbFieldInfo.uiLen = ( pField->bLen + pField->bDec * 256 ) >> 1;
uiLen = pField->bLen + pField->bDec * 256;
if( uiLen & 1 )
errCode = HB_FAILURE;
dbFieldInfo.uiLen = uiLen >> 1;
break;
case '\x1B':
dbFieldInfo.uiType = HB_FT_VARLENGTH;
dbFieldInfo.uiFlags |= HB_FF_UNICODE;
dbFieldInfo.uiLen = ( ( pField->bLen + pField->bDec * 256 ) >> 1 ) - 1;
uiLen = pField->bLen + pField->bDec * 256;
if( uiLen & 1 || uiLen < 2 )
errCode = HB_FAILURE;
dbFieldInfo.uiLen = ( uiLen >> 1 ) - 1;
break;
case '\x1C':

6
src/rdd/workarea.c
View File

@@ -505,14 +505,14 @@ static HB_ERRCODE hb_waCreateFields( AREAP pArea, PHB_ITEM pStruct )
break;
}
if( errCode == HB_SUCCESS )
errCode = SELF_ADDFIELD( pArea, &dbFieldInfo ); /* Add field */
if( errCode != HB_SUCCESS )
{
hb_errRT_DBCMD( EG_ARG, EDBCMD_DBCMDBADPARAMETER, NULL, HB_ERR_FUNCNAME );
return errCode;
}
/* Add field */
else if( SELF_ADDFIELD( pArea, &dbFieldInfo ) != HB_SUCCESS )
return HB_FAILURE;
}
return HB_SUCCESS;
}