projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
malloc: add exception info to function header
[model-checker.git]
/
malloc.c
diff --git
a/malloc.c
b/malloc.c
index 196be4320abee7c1f6a66d46f8ee1ad104f45bcd..3ec0d3fb57d1314b7bf275b24747d3049b146f12 100644
(file)
--- a/
malloc.c
+++ b/
malloc.c
@@
-6,6
+6,7
@@
#endif
#include <dlfcn.h>
#endif
#include <dlfcn.h>
+#include <new>
static void * (*real_malloc)(size_t) = NULL;
static void (*real_free)(void *ptr) = NULL;
static void * (*real_malloc)(size_t) = NULL;
static void (*real_free)(void *ptr) = NULL;
@@
-21,7
+22,7
@@
static void __my_alloc_init(void)
}
}
}
}
-void *myMalloc(size_t size)
+void *
myMalloc(size_t size)
{
if (real_malloc == NULL)
__my_alloc_init();
{
if (real_malloc == NULL)
__my_alloc_init();
@@
-36,3
+37,13
@@
void myFree(void *ptr)
real_free(ptr);
}
real_free(ptr);
}
+
+void * operator new(size_t size) throw(std::bad_alloc)
+{
+ return myMalloc(size);
+}
+
+void operator delete(void *p) throw()
+{
+ myFree(p);
+}