#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdint.h>

#define KB 1024

int main() {
  long count = 0;
  uintptr_t *ptr;

  while(1) {
    ptr = alloca((size_t)KB);
    if (!ptr) break;
    
    printf("Allocated %ld KB on the stack, got address %p\n",
	++count,(void*)ptr); 
  }
  return 0;
}

diff --git a/src/object.c b/src/object.c
index 41750ac..384baf7 100644
--- a/src/object.c
+++ b/src/object.c
@@ -8996,13 +8996,20 @@ static int nesting = 0;  /* Used to detect recursive calls */
 
 /*-------------------------------------------------------------------------*/
 static void
-restore_value_cleanup ( svalue_t * arg UNUSED)
+restore_value_cleanup ( svalue_t * arg )
 
 /* The error handler during restore value cleanup: free all resources.
  */
 
 {
+    restore_cleanup_t * data = (restore_cleanup_t *) arg;
+
+    if (data->buff)
+        xfree(data->buff);
+
     free_shared_restored_values();
+
+    xfree(arg);
 } /* restore_value_cleanup() */
 
 svalue_t *
@@ -9021,7 +9028,7 @@ f_restore_value (svalue_t *sp)
     int        restored_version; /* Formatversion of the saved data */
     char      *buff;  /* The string to parse */
     char      *p;
-    svalue_t   rcp; /* T_ERROR_HANDLER value */
+    restore_cleanup_t *rcp; /* Cleanup structure */
 
     /* The restore routines will put \0s into the string, so we
      * need to make a copy of all but malloced strings.
@@ -9030,10 +9037,10 @@ f_restore_value (svalue_t *sp)
         size_t len;
 
         len = mstrsize(sp->u.str);
-        buff = alloca(len+1);
+        buff = xalloc(len+1);
         if (!buff)
         {
-            errorf("(restore) Out of stack (%lu bytes).\n"
+            errorf("(restore) Out of memory (%lu bytes).\n"
                  , (unsigned long) len+1);
             /* NOTREACHED */
             return sp;
@@ -9056,6 +9063,7 @@ f_restore_value (svalue_t *sp)
         p = strchr(buff, '\n');
         if (!p)
         {
+            xfree(buff);
             errorf("No data given.\n");
             return sp-1;
         }
@@ -9075,6 +9083,7 @@ f_restore_value (svalue_t *sp)
     shared_restored_values = xalloc(sizeof(svalue_t)*max_shared_restored);
     if (!shared_restored_values)
     {
+        xfree(buff);
         errorf("(restore) Out of memory (%lu bytes) for shared values.\n"
              , max_shared_restored * sizeof(svalue_t));
         return sp; /* flow control hint */
@@ -9087,7 +9096,18 @@ f_restore_value (svalue_t *sp)
     *sp = const0;
 
     /* Setup the error cleanup */
-    push_error_handler(restore_value_cleanup, &rcp);
+    rcp = xalloc(sizeof(*rcp));
+    if (!rcp)
+    {
+        xfree(buff);
+        errorf("(restore) Out of memory (%lu bytes).\n"
+              , (unsigned long) sizeof(*rcp));
+        /* NOTREACHED */
+        return sp;
+    }
+    rcp->buff = buff;
+
+    push_error_handler(restore_value_cleanup, &(rcp->head));
 
     /* Now parse the value in buff[] */
 

diff --git a/src/object.c b/src/object.c
index 384baf7..86ab239 100644
--- a/src/object.c
+++ b/src/object.c
@@ -9052,24 +9052,6 @@ f_restore_value (svalue_t *sp)
     restored_version = -1;
     restored_host = -1;
 
-    /* Check if there is a version line */
-    if (buff[0] == '#')
-    {
-        int i;
-
-        i = sscanf(buff+1, "%d:%d", &restored_version, &restored_host);
-
-        /* Advance to the next line */
-        p = strchr(buff, '\n');
-        if (!p)
-        {
-            xfree(buff);
-            errorf("No data given.\n");
-            return sp-1;
-        }
-        buff = p+1;
-    }
-
     /* Initialise the shared value table */
 
     max_shared_restored = 64;
@@ -9109,9 +9091,28 @@ f_restore_value (svalue_t *sp)
 
     push_error_handler(restore_value_cleanup, &(rcp->head));
 
+    /* Check if there is a version line */
+    if (buff[0] == '#')
+    {
+        int i;
+
+        i = sscanf(buff+1, "%d:%d", &restored_version, &restored_host);
+
+        /* Advance to the next line */
+        p = strchr(buff, '\n');
+        if (!p)
+        {
+            errorf("No data given.\n");
+            return sp-1;
+        }
+        p++;
+    }
+    else
+        p = buff; /* parse from beginning of buffer */
+
+
     /* Now parse the value in buff[] */
 
-    p = buff;
     if ( (restored_version < 0 && p[0] == '\"')
          ? !old_restore_string(sp, p)
          : !restore_svalue(sp, &p, '\n')