diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 12636ff17f..372fefa6fa 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,10 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + LoadFromText() + + 2002-01-28 21:30 UTC+0100 Patrick Mast + * contrib/mysql/tmysql + Added DateTime field * Added more info on Alert message for Unknown type * Modified ClipValue2SQL() to process empty strings diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c index c0d7b833d6..08b7aeff3b 100644 --- a/harbour/source/rdd/dbf1.c +++ b/harbour/source/rdd/dbf1.c @@ -530,15 +530,19 @@ static void hb_dbfGetMemo( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem ) HB_TRACE(HB_TR_DEBUG, ("hb_dbfGetMemo(%p, %hu, %p)", pArea, uiIndex, pItem)); ulSize = hb_dbfGetMemoLen( pArea, uiIndex ); + + pBuffer = ( BYTE * ) hb_xgrab( ulSize + 1 ); if( ulSize > 0 ) { - pBuffer = ( BYTE * ) hb_xgrab( ulSize + 1 ); ulBlock = hb_dbfGetMemoBlock( pArea, uiIndex ); hb_fsSeek( pArea->hMemoFile, ulBlock * DBT_BLOCKSIZE, FS_SET ); hb_fsReadLarge( pArea->hMemoFile, pBuffer, ulSize ); - hb_itemPutCPtr( pItem, ( char * ) pBuffer, ulSize ); - hb_itemSetCMemo( pItem ); } + else + *pBuffer = '\0'; + + hb_itemPutCPtr( pItem, ( char * ) pBuffer, ulSize ); + hb_itemSetCMemo( pItem ); } /*