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

check for overflow in big strings

Browse Source
This commit is contained in:
Vitor Santos Costa 2012-10-16 08:44:26 +01:00
parent ba866a36e2
commit 610ca06883
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/parser.c
View File

@ -560,6 +560,10 @@ ParseTerm(int prio, JMPBUFF *FailBuff USES_REGS)
t = MkAtomTerm(Yap_LookupWideAtom(p)); t = MkAtomTerm(Yap_LookupWideAtom(p));
else else
t = Yap_WideStringToList(p); t = Yap_WideStringToList(p);
if (t == 0L) {
LOCAL_ErrorMessage = "Stack Overflow";
FAIL;
}
NextToken; NextToken;
} }
break; break;

4
C/scanner.c
View File

@ -836,14 +836,14 @@ ch_to_wide(char *base, char *charp)
} }
#define add_ch_to_buff(ch) \ #define add_ch_to_buff(ch) \
if (wcharp) { *wcharp++ = (ch); charp = (char *)wcharp; } \ if (wcharp) { *wcharp++ = (ch); if (wcharp >= (wchar_t *)AuxSp-1024) goto huge_var_error; charp = (char *)wcharp; } \
else { \ else { \
if (ch > MAX_ISO_LATIN1 && !wcharp) { \ if (ch > MAX_ISO_LATIN1 && !wcharp) { \
/* does not fit in ISO-LATIN */ \ /* does not fit in ISO-LATIN */ \
wcharp = ch_to_wide(TokImage, charp); \ wcharp = ch_to_wide(TokImage, charp); \
if (!wcharp) goto huge_var_error; \ if (!wcharp) goto huge_var_error; \
*wcharp++ = (ch); charp = (char *)wcharp; \ *wcharp++ = (ch); charp = (char *)wcharp; \
} else *charp++ = ch; \ } else { if (charp >= (char *)AuxSp-1024) goto huge_var_error; *charp++ = ch; } \
} }
TokEntry * TokEntry *