X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fdmalloc.c;h=cbe190c77bcd3b52540bfc9c561d12c6bea7012e;hb=9e1a8a0a598aef894f59fa8abe3ccb144a5294a8;hp=b2847b44c4e98f556755502cb775ab4224ddbd6b;hpb=f26c147b7e348a8e0b91364f4a4d100dc1832467;p=yaz-moved-to-github.git

diff --git a/util/dmalloc.c b/util/dmalloc.c
index b2847b4..cbe190c 100644
--- a/util/dmalloc.c
+++ b/util/dmalloc.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dmalloc.c,v $
- * Revision 1.1  1995-03-27 08:35:17  quinn
+ * Revision 1.5  1995-05-16 08:51:10  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/05/15  13:25:13  quinn
+ * Fixed memory bug.
+ *
+ * Revision 1.3  1995/05/15  11:56:55  quinn
+ * Debuggng & adjustments.
+ *
+ * Revision 1.2  1995/04/10  10:23:50  quinn
+ * Fixes.
+ *
+ * Revision 1.1  1995/03/27  08:35:17  quinn
  * Created util library
  * Added memory debugging module. Imported options-manager
  *
@@ -15,9 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 
-static const unsigned long head = 0xaabbccdd;
-static const unsigned long tail = 0x11223344;
-static const unsigned long freed = 0xffeeffee;
+static const unsigned char head[] = {44, 33, 22, 11};
+static const unsigned char tail[] = {11, 22, 33, 44};
+static const unsigned char freed[] = {99, 99, 99, 99};
 
 void *d_malloc(char *file, int line, int nbytes)
 {
@@ -26,7 +38,7 @@ void *d_malloc(char *file, int line, int nbytes)
 
     if (!(res = malloc(nbytes + 3 * sizeof(long))))
     	return 0;
-    fprintf(stderr, "---d_malloc, '%s':%d, %d->0x%p\n",
+    fprintf(stderr, "---d_malloc, '%s':%d, %d->%p\n",
     	file, line, nbytes, res + 2 * sizeof(long));
     len = nbytes;
     memcpy(res, &head, sizeof(long));
@@ -42,11 +54,11 @@ void d_free(char *file, int line, char *ptr)
 
     if (memcmp(&head, ptr - 2 * sizeof(long), sizeof(long)))
     	abort();
-    memcpy(ptr, &freed, sizeof(long));
+    memcpy(ptr - 2 * sizeof(long), &freed, sizeof(long));
     memcpy(&len, ptr - sizeof(long), sizeof(long));
     if (memcmp(ptr + len, &tail, sizeof(long)))
     	abort();
-    fprintf(stderr, "---d_free, '%s':%d, 0x%p (%d)\n",
+    fprintf(stderr, "---d_free, '%s':%d, %p (%d)\n",
     	file, line, ptr, len);
     free(ptr - 2 * sizeof(long));
     return;
@@ -63,17 +75,12 @@ void *d_realloc(char *file, int line, char *ptr, int nbytes)
     memcpy(&len, ptr - sizeof(long), sizeof(long));
     if (memcmp(ptr + len, &tail, sizeof(long)))
     	abort();
-    if (!(r = realloc(ptr, nbytes + 3 * sizeof(long))))
+    if (!(r = realloc(ptr - 2 * sizeof(long), nbytes + 3 * sizeof(long))))
     	return 0;
-    fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, 0x%p->0x%p\n",
+    fprintf(stderr, "---d_realloc, '%s':%d, %d->%d, %p->%p\n",
     	file, line, len, nbytes, p, r + 2 * sizeof(long));
     memcpy(r, &head, sizeof(long));
     memcpy(r + sizeof(long), &nlen, sizeof(long));
-    if (r != ptr - 2 * sizeof(long))
-    {
-    	memcpy(r + 2 * sizeof(long), ptr, len);
-	memcpy(ptr - 2 * sizeof(long), &freed, sizeof(long));
-    }
     r += 2 * sizeof(long);
     memcpy(r + nbytes, &tail, sizeof(long));
     return r;