From 7864d8354318a4b0c0ea2520e4e1d714224d0e06 Mon Sep 17 00:00:00 2001 From: Ryszard Glab Date: Tue, 28 Mar 2006 12:25:21 +0000 Subject: [PATCH] 2006-03-28 14:35 UTC+0100 Ryszard Glab * include/hbexpra.c * fixed optimization of 'EVAL' in macro compiler * source/pp/ppcore.c * fixed calculation of length of stringify expressions --- harbour/ChangeLog | 8 ++++++++ harbour/include/hbexpra.c | 2 +- harbour/source/pp/ppcore.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 13b077115d..70c17c4ed6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,14 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ * source/pp/ppcore.c + * added two guards for buffer overflow + + +2006-03-28 18:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/compiler/harbour.c + ! upper the default .prg function name created from .prg file name + when compiled without -n switch + 2006-03-28 17:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/hvm.c diff --git a/harbour/include/hbexpra.c b/harbour/include/hbexpra.c index e7b663c436..1ced6fcd48 100644 --- a/harbour/include/hbexpra.c +++ b/harbour/include/hbexpra.c @@ -387,7 +387,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms ) #ifndef HB_MACRO_SUPPORT hb_compExprNewSend( pParms->value.asList.pExprList, hb_compIdentifierNew( "EVAL", TRUE ) ), #else - hb_compExprNewSend( pParms->value.asList.pExprList, "EVAL" ), + hb_compExprNewSend( pParms->value.asList.pExprList, hb_strdup("EVAL") ), #endif hb_compExprNewArgList( pParms->value.asList.pExprList->pNext ) ); diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index a77351617c..61c8b722fb 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -3387,7 +3387,7 @@ static int pp_Stringify( BOOL bSmart, char **ptro, int *lenres, char *expr, int ( *ptro )++; rmlen++; } - rmlen += lenitem + iAdd; + rmlen += lenTrim + iAdd; return rmlen; }