diff options
| author | Robin Watts <robin@peeved.(none)> | 2014-01-10 11:59:46 -0800 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2014-01-13 15:44:37 +0000 |
| commit | c2980368cc3b03b755629c506720121ddd60e406 (patch) | |
| tree | 1000faa7cb4937c5c87821a1955709dd6feedbe9 /source | |
| parent | b35b2c96ba29cecfe91f3d429b2fb4717981f70a (diff) | |
| download | mupdf-c2980368cc3b03b755629c506720121ddd60e406.tar.xz | |
Memento fixes for working with valgrind.
Remember to make blocks defined before writing/reading them.
Diffstat (limited to 'source')
| -rw-r--r-- | source/fitz/memento.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/fitz/memento.c b/source/fitz/memento.c index 47aded31..8b19c599 100644 --- a/source/fitz/memento.c +++ b/source/fitz/memento.c @@ -957,7 +957,9 @@ void *Memento_label(void *ptr, const char *label) if (ptr == NULL) return NULL; block = MEMBLK_FROMBLK(ptr); + VALGRIND_MAKE_MEM_DEFINED(block, sizeof(*block)); block->label = label; + VALGRIND_MAKE_MEM_UNDEFINED(block, sizeof(*block)); return ptr; } @@ -1093,6 +1095,7 @@ void Memento_free(void *blk) if (checkBlock(memblk, "free")) return; + VALGRIND_MAKE_MEM_DEFINED(memblk, sizeof(*memblk)); if (memblk->flags & Memento_Flag_BreakOnFree) Memento_breakpoint(); @@ -1136,14 +1139,17 @@ void *Memento_realloc(void *blk, size_t newsize) if (checkBlock(memblk, "realloc")) return NULL; + VALGRIND_MAKE_MEM_DEFINED(memblk, sizeof(*memblk)); if (memblk->flags & Memento_Flag_BreakOnRealloc) Memento_breakpoint(); + VALGRIND_MAKE_MEM_DEFINED(memblk, sizeof(*memblk)); if (globals.maxMemory != 0 && globals.alloc - memblk->rawsize + newsize > globals.maxMemory) return NULL; newsizemem = MEMBLK_SIZE(newsize); Memento_removeBlock(&globals.used, memblk); + VALGRIND_MAKE_MEM_DEFINED(memblk, sizeof(*memblk)); flags = memblk->flags; newmemblk = MEMENTO_UNDERLYING_REALLOC(memblk, newsizemem); if (newmemblk == NULL) @@ -1160,6 +1166,7 @@ void *Memento_realloc(void *blk, size_t newsize) newmemblk->flags = flags; if (newmemblk->rawsize < newsize) { char *newbytes = ((char *)MEMBLK_TOBLK(newmemblk))+newmemblk->rawsize; + VALGRIND_MAKE_MEM_DEFINED(newbytes, newsize - newmemblk->rawsize); #ifndef MEMENTO_LEAKONLY memset(newbytes, MEMENTO_ALLOCFILL, newsize - newmemblk->rawsize); #endif |