From 170f3c9d2736894b9442d9280282e3b643c0f70f Mon Sep 17 00:00:00 2001 From: "Alexander S.Kresin" Date: Wed, 27 Nov 2002 10:25:47 +0000 Subject: [PATCH] 2002-11-27 13:30 UTC+0300 Alexander Kresin --- harbour/ChangeLog | 7 +++++++ harbour/source/rdd/dbfntx/dbfntx1.c | 3 +++ harbour/source/rtl/cdpapi.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f1d13753e5..5e6e3f1d69 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2002-12-01 23:12 UTC+0100 Foo Bar */ +2002-11-27 13:30 UTC+0300 Alexander Kresin + * source/rdd/dbfntx/dbfntx1.c + ! Bug fixed, reported by Carlos Andr©s + * source/rtl/cdpapi.c + ! Bug fixed in HB_TRANSLATE() + 2002-11-26 21:20 UTC+0100 Tomaz Zupan * contrib/odbc/browodbc.prg ! There was a bug in skipping, that threw an error when @@ -18,6 +24,7 @@ ! removed unused Var * source/rtl/menuto.prg ! minor formating + 2002-11-21 12:05 UTC+0300 Alexander Kresin * source/rdd/dbfntx/dbfntx1.c * DBOI_ORDERCOUNT is supported now diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c index 1b318765dd..928b43eca9 100644 --- a/harbour/source/rdd/dbfntx/dbfntx1.c +++ b/harbour/source/rdd/dbfntx/dbfntx1.c @@ -3993,6 +3993,9 @@ static ERRCODE ntxOrderListRebuild( NTXAREAP pArea ) HB_TRACE(HB_TR_DEBUG, ("ntxOrderListRebuild(%p)", pArea)); + if( SELF_GOCOLD( ( AREAP ) pArea ) == FAILURE ) + return FAILURE; + pTag = pArea->lpNtxTag; pTagTmp = pArea->lpCurTag; pArea->fValidBuffer = TRUE; diff --git a/harbour/source/rtl/cdpapi.c b/harbour/source/rtl/cdpapi.c index d19df1cc54..a27eea509f 100644 --- a/harbour/source/rtl/cdpapi.c +++ b/harbour/source/rtl/cdpapi.c @@ -396,9 +396,9 @@ HB_FUNC( HB_TRANSLATE ) ilen = hb_parclen(1); cdpIn = ( szIdIn )? hb_cdpFind( szIdIn ):s_cdpage; cdpOut = ( szIdOut )? hb_cdpFind( szIdOut ):s_cdpage; - szResult = (char*) hb_xgrab( ilen + 1 ); memcpy( szResult, szIn, ilen ); + szResult[ ilen ] = '\0'; hb_cdpTranslate( szResult, cdpIn, cdpOut ); hb_retc_buffer( szResult );