--- psiconv/trunk/lib/psiconv/generate_page.c	2004/02/25 20:57:10	231
+++ psiconv/trunk/lib/psiconv/generate_page.c	2005/11/15 15:52:34	270
@@ -1,6 +1,6 @@
 /*
     generate_page.c - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 2000-2004  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 2000-2005  Frodo Looijaard <frodo@frodo.looijaard.name>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -50,10 +50,12 @@
   }
 
   if (!(basepara=psiconv_basic_paragraph_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR1;
   }
   if (!(basechar=psiconv_basic_character_layout())) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     res = -PSICONV_E_NOMEM;
     goto ERROR2;
   }
@@ -132,9 +134,14 @@
     goto ERROR3;
   if ((res = psiconv_write_bool(config,buf,lev+1,value->landscape)))
     goto ERROR3;
-  if ((res = psiconv_buffer_concat(buf,header_buf)))
+  if ((res = psiconv_buffer_concat(buf,header_buf))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
     goto ERROR3;
-  res = psiconv_buffer_concat(buf,footer_buf);
+  }
+  if ((res = psiconv_buffer_concat(buf,footer_buf))) {
+    psiconv_error(config,lev+1,0,"Out of memory error");
+    goto ERROR3;
+  }
 
 
 ERROR3: