X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satcheck.git;a=blobdiff_plain;f=mymemory.cc;h=23f448f3b1dfefb04b2a55b96913adab54967f61;hp=ea65c8967f471db37c601ca41a103e607f5d4e7d;hb=HEAD;hpb=fdc038715881f395ddbac1625160236f8db2c1d7 diff --git a/mymemory.cc b/mymemory.cc index ea65c89..23f448f 100644 --- a/mymemory.cc +++ b/mymemory.cc @@ -212,7 +212,7 @@ void * real_user_malloc(size_t size) size=(size+7)&~((size_t)7); void *tmp = snapshot_struct->allocation_ptr; snapshot_struct->allocation_ptr = (void *)((char *) snapshot_struct->allocation_ptr +size); - + ASSERT(snapshot_struct->allocation_ptr <= snapshot_struct->top_ptr); return tmp; } @@ -239,12 +239,13 @@ void *malloc(size_t size) /** @brief Snapshotting free implementation for user programs */ void free(void * ptr) { - if (!DontFree(ptr)) + if (!DontFree(ptr)) { if (switch_alloc) { model_free(ptr); } else { mspace_free(user_snapshot_space, ptr); } + } } /** @brief Snapshotting realloc implementation for user programs */ @@ -307,7 +308,7 @@ void operator delete[](void *p, size_t size) free(p); } -#else /* !USE_MPROTECT_SNAPSHOT */ +#else /* !USE_MPROTECT_SNAPSHOT */ /** @brief Snapshotting allocation function for use by the Thread class only */ void * Thread_malloc(size_t size) @@ -321,4 +322,4 @@ void Thread_free(void *ptr) free(ptr); } -#endif /* !USE_MPROTECT_SNAPSHOT */ +#endif/* !USE_MPROTECT_SNAPSHOT */