diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix parser overflow bug: vars should be reset even when addresses would not

Browse Source 
change.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1466 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2005-11-22 12:42:39 +00:00
parent 253f5e7f9a
commit 03c1edcc90
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/grow.c
View File

@ -1336,6 +1336,10 @@ static int do_growtrail(long size, int contiguous_only, int in_parser, tr_fr_ptr
execute_growstack(size, TRUE, in_parser, old_trp, tksp, vep); execute_growstack(size, TRUE, in_parser, old_trp, tksp, vep);
} else { } else {
YAPEnterCriticalSection(); YAPEnterCriticalSection();
if (in_parser) {
TrDiff = LDiff = GDiff = DelayDiff = XDiff = HDiff = 0;
AdjustScannerStacks(tksp, vep);
}
Yap_TrailTop += size; Yap_TrailTop += size;
YAPLeaveCriticalSection(); YAPLeaveCriticalSection();
} }

6
C/parser.c
View File

@ -350,9 +350,13 @@ ParseArgs(Atom a, JMPBUFF *FailBuff)
else else
t = Yap_MkApplTerm(Yap_MkFunctor(a, nargs), nargs, p); t = Yap_MkApplTerm(Yap_MkFunctor(a, nargs), nargs, p);
#endif #endif
if (H > ASP-4096) {
Yap_ErrorMessage = "Stack Overflow";
return TermNil;
}
/* check for possible overflow against local stack */ /* check for possible overflow against local stack */
checkfor((Term) ')', FailBuff); checkfor((Term) ')', FailBuff);
return (t); return t;
} }