From 3a3220d1a13abd3bae395859df6b054a558c7291 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Thu, 21 May 2009 01:04:13 -0500
Subject: [PATCH] make sure we don't generate an heapexpansion in the middle of
 a write.

---
 C/write.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/C/write.c b/C/write.c
index a1a70923c..d2b86ef90 100644
--- a/C/write.c
+++ b/C/write.c
@@ -539,16 +539,21 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
 	  char *s;
 	  s = (char *) Yap_PreAllocCodeSpace();
 	  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;
 	      break;
 	    }
 	    s = (char *) Yap_PreAllocCodeSpace();
+#else
+	    s = NULL;
+#endif
 	  }
 	  if (!s) {
 	    s = (char *)TR;
 	    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;
 		break;
 	      }
@@ -562,8 +567,6 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
 	      s = NULL;
 	    }
 	  }
-	  if (!s)
-	    return;
 	  if (mpz_sgn(big) < 0) {
 	    if (lastw == symbol)
 	      wrputc(' ', wglb->writewch);  
@@ -571,8 +574,16 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb)
 	    if (lastw == alphanum)
 	      wrputc(' ', wglb->writewch);
 	  }
-	  mpz_get_str(s, 10, big);
-	  wrputs(s,wglb->writewch);
+	  if (!s) {
+	    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
 	{