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

check for memory overflow; avoid possible misalignments

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

18
C/adtdefs.c
View File

@ -210,6 +210,7 @@ LookupAtom(char *atom)
return na; return na;
} }
static Atom static Atom
LookupWideAtom(wchar_t *atom) LookupWideAtom(wchar_t *atom)
{ /* lookup atom in atom table */ { /* lookup atom in atom table */
@ -248,12 +249,16 @@ LookupWideAtom(wchar_t *atom)
#endif #endif
/* add new atom to start of chain */ /* add new atom to start of chain */
sz = wcslen(atom); sz = wcslen(atom);
ae = (AtomEntry *) Yap_AllocAtomSpace(sizeof(AtomEntry) + sizeof(wchar_t)*(sz + 1)+sizeof(WideAtomEntry)); ae = (AtomEntry *) Yap_AllocAtomSpace((size_t)(((AtomEntry *)NULL)+1) + sizeof(wchar_t)*(sz + 1));
if (ae == NULL) { if (ae == NULL) {
WRITE_UNLOCK(WideHashChain[hash].AERWLock); WRITE_UNLOCK(WideHashChain[hash].AERWLock);
return NIL; return NIL;
} }
wae = (WideAtomEntry *)(ae->StrOfAE+sizeof(wchar_t)*(sz + 1)); wae = (WideAtomEntry *) Yap_AllocAtomSpace(sizeof(WideAtomEntry));
if (wae == NULL) {
WRITE_UNLOCK(WideHashChain[hash].AERWLock);
return NIL;
}
na = AbsAtom(ae); na = AbsAtom(ae);
ae->PropsOfAE = AbsWideAtomProp(wae); ae->PropsOfAE = AbsWideAtomProp(wae);
wae->NextOfPE = NIL; wae->NextOfPE = NIL;
@ -1196,6 +1201,7 @@ Yap_NStringToList(char *s, size_t len)
return t; return t;
} }
Term Term
Yap_WideStringToList(wchar_t *s) Yap_WideStringToList(wchar_t *s)
{ {
@ -1205,6 +1211,8 @@ Yap_WideStringToList(wchar_t *s)
t = MkAtomTerm(AtomNil); t = MkAtomTerm(AtomNil);
while (cp > s) { while (cp > s) {
if (ASP < H+1024)
return (CELL)0;
t = MkPairTerm(MkIntegerTerm(*--cp), t); t = MkPairTerm(MkIntegerTerm(*--cp), t);
} }
return t; return t;
@ -1219,6 +1227,8 @@ Yap_NWideStringToList(wchar_t *s, size_t len)
t = MkAtomTerm(AtomNil); t = MkAtomTerm(AtomNil);
while (cp > s) { while (cp > s) {
if (ASP < H+1024)
return (CELL)0;
t = MkPairTerm(MkIntegerTerm(*--cp), t); t = MkPairTerm(MkIntegerTerm(*--cp), t);
} }
return t; return t;
@ -1323,6 +1333,8 @@ Yap_WideStringToListOfAtoms(wchar_t *s)
t = MkAtomTerm(AtomNil); t = MkAtomTerm(AtomNil);
while (cp > s) { while (cp > s) {
so[0] = *--cp; so[0] = *--cp;
if (ASP < H+1024)
return (CELL)0;
t = MkPairTerm(MkAtomTerm(LookupWideAtom(so)), t); t = MkPairTerm(MkAtomTerm(LookupWideAtom(so)), t);
} }
return t; return t;
@ -1339,6 +1351,8 @@ Yap_NWideStringToListOfAtoms(wchar_t *s, size_t len)
so[1] = '\0'; so[1] = '\0';
t = MkAtomTerm(AtomNil); t = MkAtomTerm(AtomNil);
while (cp > s) { while (cp > s) {
if (ASP < H+1024)
return (CELL)0;
so[0] = *--cp; so[0] = *--cp;
t = MkPairTerm(MkAtomTerm(LookupWideAtom(so)), t); t = MkPairTerm(MkAtomTerm(LookupWideAtom(so)), t);
} }