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

make sure we don't generate an heapexpansion in the middle of a write.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-21 01:04:13 -05:00
parent a58e3d812d
commit 3a3220d1a1
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
C/write.c
View File

@ -539,16 +539,21 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
char *s; char *s;
s = (char *) Yap_PreAllocCodeSpace(); s = (char *) Yap_PreAllocCodeSpace();
while (s+3+mpz_sizeinbase(big, 10) >= (char *)AuxSp) { while (s+3+mpz_sizeinbase(big, 10) >= (char *)AuxSp) {
if (!Yap_ExpandPreAllocCodeSpace(mpz_sizeinbase(big, 10),NULL)) { #if USE_SYSTEM_MALLOC
/* may require stack expansion */
if (!Yap_ExpandPreAllocCodeSpace(3+mpz_sizeinbase(big, 10),NULL)) {
s = NULL; s = NULL;
break; break;
} }
s = (char *) Yap_PreAllocCodeSpace(); s = (char *) Yap_PreAllocCodeSpace();
#else
s = NULL;
#endif
} }
if (!s) { if (!s) {
s = (char *)TR; s = (char *)TR;
while (s+3+mpz_sizeinbase(big, 10) >= Yap_TrailTop) { while (s+3+mpz_sizeinbase(big, 10) >= Yap_TrailTop) {
if (!Yap_growtrail(mpz_sizeinbase(big, 10)/sizeof(CELL), FALSE)) { if (!Yap_growtrail((3+mpz_sizeinbase(big, 10))/sizeof(CELL), FALSE)) {
s = NULL; s = NULL;
break; break;
} }
@ -562,8 +567,6 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
s = NULL; s = NULL;
} }
} }
if (!s)
return;
if (mpz_sgn(big) < 0) { if (mpz_sgn(big) < 0) {
if (lastw == symbol) if (lastw == symbol)
wrputc(' ', wglb->writewch); wrputc(' ', wglb->writewch);
@ -571,8 +574,16 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
if (lastw == alphanum) if (lastw == alphanum)
wrputc(' ', wglb->writewch); wrputc(' ', wglb->writewch);
} }
mpz_get_str(s, 10, big); if (!s) {
wrputs(s,wglb->writewch); s = mpz_get_str(NULL, 10, big);
if (!s)
return;
wrputs(s,wglb->writewch);
free(s);
} else {
mpz_get_str(s, 10, big);
wrputs(s,wglb->writewch);
}
} }
#else #else
{ {