X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fxmalloc.c;h=ce7852aafe3ccc86899d433c7452debbfb6cb329;hb=113640450c45ca7ac96285cc8ca666bfd597ed21;hp=8b372e864c87193553642972d6e04986990ea323;hpb=4eb98bb29689c555b7c854d7b175b60c153d0691;p=yaz-moved-to-github.git

diff --git a/util/xmalloc.c b/util/xmalloc.c
index 8b372e8..ce7852a 100644
--- a/util/xmalloc.c
+++ b/util/xmalloc.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmalloc.c,v $
- * Revision 1.2  1995-12-05 11:08:37  adam
+ * Revision 1.4  1996-07-03 13:21:36  adam
+ * Function xfree_f checks for NULL pointer.
+ *
+ * Revision 1.3  1995/12/05  15:08:44  adam
+ * Fixed verbose of xrealloc.
+ *
+ * Revision 1.2  1995/12/05  11:08:37  adam
  * More verbose malloc routines.
  *
  * Revision 1.1  1995/11/01  11:56:53  quinn
@@ -40,20 +46,16 @@
 
 void *xrealloc_f (void *o, size_t size, char *file, int line)
 {
-    void *p;
+    void *p = realloc (o, size);
 
 #ifdef TRACE_XMALLOC
-    fprintf(stderr, "%s:%d: xrealloc(s=%d) %p", file, line, size, p);
+    fprintf(stderr, "%s:%d: xrealloc(s=%d) %p -> %p\n", file, line, size, o, p);
 #endif
-    p = realloc (o, size);
     if (!p)
     {
     	logf (LOG_FATAL|LOG_ERRNO, "Out of memory, realloc (%d bytes)", size);
     	exit(1);
     }
-#ifdef TRACE_XMALLOC
-    fprintf(stderr, " -> %p\n", p);
-#endif
     return p;
 }
 
@@ -99,6 +101,8 @@ char *xstrdup_f (const char *s, char *file, int line)
 
 void xfree_f(void *p, char *file, int line)
 {
+    if (!p)
+        return ;
 #ifdef TRACE_XMALLOC
     if (p)
         fprintf(stderr, "%s:%d: xfree %p\n", file, line, p);