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

2017-11-14 20:30 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)

Browse Source 
* src/rdd/dbf1.c
    ! fixed typo in index used inside DBS_ISNULL
    ! fixed blanking new record for variable length unicode fields (Q:U)
    ; above fix problems reported by KevinC - many thanks for information
      about the problems and self contain examples - such support really
      helps
    * added protection against possible GPF when corrupted Q:U fields are
      read from DBF file
This commit is contained in:
Przemysław Czerpak
2017-11-14 20:30:47 +01:00
parent 3bb0f06ec9
commit 39041d159c
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog.txt
View File

@@ -7,6 +7,16 @@
Entries may not always be in chronological/commit order.
See license at the end of file. */
2017-11-14 20:30 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* src/rdd/dbf1.c
! fixed typo in index used inside DBS_ISNULL
! fixed blanking new record for variable length unicode fields (Q:U)
; above fix problems reported by KevinC - many thanks for information
about the problems and self contain examples - such support really
helps
* added protection against possible GPF when corrupted Q:U fields are
read from DBF file
2017-11-14 19:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
* contrib/hbmzip/mzip.c
* use 'char *' instead of 'zipcharpc' to compile with minizip versions

10
src/rdd/dbf1.c
View File

@@ -459,6 +459,11 @@ static void hb_dbfSetBlankRecord( DBFAREAP pArea, int iType )
bNext = '\0';
break;
case HB_FT_VARLENGTH:
if( pField->uiFlags & HB_FF_UNICODE )
uiLen = ( uiLen + 1 ) << 1;
/* fallthrough */
default:
bNext = '\0';
break;
@@ -2171,7 +2176,8 @@ static HB_ERRCODE hb_dbfGetValue( DBFAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pI
if( ( pField->uiFlags & HB_FF_UNICODE ) != 0 )
{
nLen = HB_GET_LE_UINT16( &pArea->pRecord[ pArea->pFieldOffset[ uiIndex ] + ( nLen << 1 ) ] );
if( nLen == 0xFFFF )
if( nLen == 0xFFFF ||
nLen > pField->uiLen ) /* protection against corrupted files */
nLen = 0;
hb_itemPutStrLenU16( pItem, HB_CDP_ENDIAN_LITTLE,
( const HB_WCHAR * ) &pArea->pRecord[ pArea->pFieldOffset[ uiIndex ] ],
@@ -3885,7 +3891,7 @@ static HB_ERRCODE hb_dbfFieldInfo( DBFAREAP pArea, HB_USHORT uiIndex, HB_USHORT
pField = pArea->area.lpFields + uiIndex - 1;
hb_itemPutL( pItem,
( pField->uiFlags & HB_FF_NULLABLE ) != 0 &&
hb_dbfGetNullFlag( pArea, pArea->pFieldBits[ uiIndex ].uiNullBit ) );
hb_dbfGetNullFlag( pArea, pArea->pFieldBits[ uiIndex - 1 ].uiNullBit ) );
return HB_SUCCESS;
case DBS_COUNTER:
if( hb_dbfIsAutoIncField( pArea->area.lpFields + uiIndex - 1 ) != HB_AUTOINC_NONE )