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

2011-07-22 09:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/vm/hvm.c
    ! added protection against self-recursive iterating in code like:
         FOR EACH var in @var
            [...]
         NEXT
      Now RTE is generated in such case instead of GPF
This commit is contained in:
Przemyslaw Czerpak
2011-07-22 07:57:30 +00:00
parent 513191819d
commit fd4699533c
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-07-22 09:57 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/vm/hvm.c
! added protection against self-recursive iterating in code like:
FOR EACH var in @var
[...]
NEXT
Now RTE is generated in such case instead of GPF
2011-07-21 01:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* INSTALL
! typo

16
harbour/src/vm/hvm.c
View File

@@ -4621,7 +4621,6 @@ static void hb_vmEnumStart( int nVars, int nDescend )
pValue = hb_stackItemFromTop( -i );
/* create extended reference for enumerator destructor */
hb_vmEnumReference( pValue );
pBase = &( ( PHB_ENUMREF ) pValue->item.asExtRef.value )->basevalue;
/* store the reference to control variable */
pEnumRef = hb_stackItemFromTop( -i + 1 );
hb_itemCopy( &( ( PHB_ENUMREF ) pValue->item.asExtRef.value )->enumref,
@@ -4631,14 +4630,19 @@ static void hb_vmEnumStart( int nVars, int nDescend )
/* store the old value of control variable and clear it */
hb_itemMove( &( ( PHB_ENUMREF ) pValue->item.asExtRef.value )->oldvalue,
pEnum );
/* set the iterator value */
pEnum->type = HB_IT_BYREF | HB_IT_ENUM;
pEnum->item.asEnum.basePtr = pBase;
pEnum->item.asEnum.valuePtr = NULL;
pBase = &( ( PHB_ENUMREF ) pValue->item.asExtRef.value )->basevalue;
if( HB_IS_BYREF( pBase ) )
pBase = hb_itemUnRef( pBase );
if( HB_IS_COMPLEX( pEnum ) )
hb_itemClear( pEnum );
/* set the iterator value */
pEnum->type = HB_IT_BYREF | HB_IT_ENUM;
pEnum->item.asEnum.basePtr = &( ( PHB_ENUMREF ) pValue->item.asExtRef.value )->basevalue;
pEnum->item.asEnum.valuePtr = NULL;
if( HB_IS_OBJECT( pBase ) && hb_objHasOperator( pBase, HB_OO_OP_ENUMSTART ) )
{
pEnum->item.asEnum.offset = 0;
@@ -4687,7 +4691,7 @@ static void hb_vmEnumStart( int nVars, int nDescend )
else
fStart = HB_FALSE;
}
else
else if( hb_vmRequestQuery() == 0 )
{
hb_errRT_BASE( EG_ARG, 1068, NULL, hb_langDGetErrorDesc( EG_ARRACCESS ), 1, pBase );
return;