0
@@ -930,8 +930,8 @@ int main(int argc, char* argv[], char *envp[] )
0
 //#endif
0
 
0
 #undef exit
0
-void dbexit(int rc) { 
0
-	cout << "  dbexit: flushing op log and files" << endl;
0
+void dbexit(int rc, const char *why) { 
0
+	cout << "  dbexit: " << why << "; flushing op log and files" << endl;
0
   flushOpLog();
0
 
0
   /* must do this before unmapping mem or you may get a seg fault */

0
@@ -11,6 +11,25 @@ const bool debug=true;
0
 const bool debug=false;
0
 #endif
0
 
0
+#include <memory>
0
+
0
+extern void dbexit(int returnCode, const char *whyMsg = "");
0
+
0
+inline void * ourmalloc(size_t size) { 
0
+	void *x = malloc(size);
0
+	if( x == 0 ) dbexit(42, "malloc fails");
0
+	return x;
0
+}
0
+
0
+inline void * ourrealloc(void *ptr, size_t size) { 
0
+	void *x = realloc(ptr, size);
0
+	if( x == 0 ) dbexit(43, "realloc fails");
0
+	return x;
0
+}
0
+
0
+#define malloc ourmalloc
0
+#define realloc ourrealloc
0
+
0
 #include "targetver.h"
0
 
0
 //#include "assert.h"
0
@@ -126,7 +145,6 @@ inline void our_debug_free(void *p) {
0
 #define free our_debug_free
0
 #endif
0
 
0
-void dbexit(int resultcode);
0
 #define exit dbexit
0
 
0
 #undef yassert

0
@@ -53,4 +53,3 @@ extern Logstream logstream;
0
 inline Logstream& problem() { return logstream.prolog(); }
0
 
0
 #define cout logstream
0
-