Index: branches/JrCs/i386/libsa/libsa.h
===================================================================
--- branches/JrCs/i386/libsa/libsa.h	(revision 21)
+++ branches/JrCs/i386/libsa/libsa.h	(revision 22)
@@ -91,8 +91,9 @@
 /*
  * zalloc.c
  */
+#define malloc(size)	safe_malloc(size, __FILE__, __LINE__)
 extern void   malloc_init(char * start, int size, int nodes, void (*malloc_error)(char *, size_t));
-extern void * malloc(size_t size);
+extern void * safe_malloc(size_t size,const char *file, int line);
 extern void   free(void * start);
 extern void * realloc(void * ptr, size_t size);
 
Index: branches/JrCs/i386/libsa/zalloc.c
===================================================================
--- branches/JrCs/i386/libsa/zalloc.c	(revision 21)
+++ branches/JrCs/i386/libsa/zalloc.c	(revision 22)
@@ -86,7 +86,7 @@
 
 #define BEST_FIT 1
 
-void * malloc(size_t size)
+void * safe_malloc(size_t size, const char *file, int line)
 {
 	int    i;
 #if BEST_FIT
@@ -315,7 +315,7 @@
 /* This is the simplest way possible.  Should fix this. */
 void * realloc(void * start, size_t newsize)
 {
-    void * newstart = malloc(newsize);
+    void * newstart = safe_malloc(newsize, __FILE__, __LINE__);
     bcopy(start, newstart, newsize);
     free(start);
     return newstart;