diff options
| -rw-r--r-- | intern/guardedalloc/intern/mallocn.c | 3 | ||||
| -rw-r--r-- | intern/guardedalloc/test/simpletest/memtest.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c index 3e6aed7871a..fc345eee5a8 100644 --- a/intern/guardedalloc/intern/mallocn.c +++ b/intern/guardedalloc/intern/mallocn.c @@ -157,7 +157,8 @@ int MEM_check_memory_integrity() err_val = check_memlist(listend); - return (int)err_val; + if (err_val == 0) return 0; + return 1; } diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c index 7c5a8230ea7..c35af2d9ce2 100644 --- a/intern/guardedalloc/test/simpletest/memtest.c +++ b/intern/guardedalloc/test/simpletest/memtest.c @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) /* Round one, do a normal allocation, and free the blocks again. */ /* ----------------------------------------------------------------- */ /* flush mem lib output to stderr */ - MEM_set_error_stream(stderr); + MEM_set_error_callback(stderr); for (i = 0; i < NUM_BLOCKS; i++) { int blocksize = 10000; @@ -110,7 +110,7 @@ int main (int argc, char *argv[]) /* Round two, do a normal allocation, and corrupt some blocks. */ /* ----------------------------------------------------------------- */ /* switch off, because it will complain about some things. */ - MEM_set_error_stream(NULL); + MEM_set_error_callback(NULL); for (i = 0; i < NUM_BLOCKS; i++) { int blocksize = 10000; |