random memory leak fixes and memory access fixes

[model-checker.git] / mymemory.cc

diff --git a/mymemory.cc b/mymemory.cc
index b702d39945fa5cbaa7953b106aad3f7fa748a273..29fd2ea94a1ebaa57767a3542dd1d78fe454d25d 100644 (file)
--- a/mymemory.cc
+++ b/mymemory.cc
@@ -14,7 +14,7 @@ static mspace sStaticSpace = NULL;
 #endif
 
 /** Non-snapshotting calloc for our use. */
-void *MYCALLOC(size_t count, size_t size) {
+void *model_calloc(size_t count, size_t size) {
 #if USE_MPROTECT_SNAPSHOT
        static void *(*callocp)(size_t count, size_t size)=NULL;
        char *error;
@@ -41,7 +41,7 @@ void *MYCALLOC(size_t count, size_t size) {
 }
 
 /** Non-snapshotting malloc for our use. */
-void *MYMALLOC(size_t size) {
+void *model_malloc(size_t size) {
 #if USE_MPROTECT_SNAPSHOT
        static void *(*mallocp)(size_t size)=NULL;
        char *error;
@@ -100,7 +100,7 @@ void system_free( void * ptr ){
 }
 
 /** Non-snapshotting free for our use. */
-void MYFREE(void *ptr) {
+void model_free(void *ptr) {
 #if USE_MPROTECT_SNAPSHOT
        static void (*freep)(void *);
        char *error;
@@ -157,9 +157,9 @@ bool DontFree( void * ptr ){
 
 /** Snapshotting malloc implementation for user programs. */
 void *malloc( size_t size ) {
-       if (mySpace)
+       if (mySpace) {
                return mspace_malloc( mySpace, size );
-       else
+       }       else
                return HandleEarlyAllocationRequest( size );
 }