diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-12-22 11:25:52 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-12-27 15:06:51 +0100 |
| commit | c21d2afbe921fb8b12e07a2eccdf7cf7a0e2bf61 (patch) | |
| tree | 22bade79fd3fb3b5d06ae46f759d11a4d1346f20 | |
| parent | 0805c1add0e3fc951d16c27d3837bc5123842303 (diff) | |
| download | mupdf-c21d2afbe921fb8b12e07a2eccdf7cf7a0e2bf61.tar.xz | |
js: Fix allocator callbacks so they don't throw fitz exceptions.
Valgrind doesn't know realloc(p, 0) is equivalent to free(p), so
unfortunately we can't reduce all calls to just realloc().
| -rw-r--r-- | source/pdf/pdf-js.c | 4 | ||||
| -rw-r--r-- | source/tools/murun.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/pdf/pdf-js.c b/source/pdf/pdf-js.c index f3a2ca80..aeba801c 100644 --- a/source/pdf/pdf-js.c +++ b/source/pdf/pdf-js.c @@ -589,9 +589,7 @@ static void *pdf_js_alloc(void *actx, void *ptr, int n) fz_free(ctx, ptr); return NULL; } - if (ptr) - return fz_resize_array(ctx, ptr, n, 1); - return fz_malloc_array(ctx, n, 1); + return fz_resize_array_no_throw(ctx, ptr, n, 1); } static pdf_js *pdf_new_js(fz_context *ctx, pdf_document *doc) diff --git a/source/tools/murun.c b/source/tools/murun.c index 5469483a..bff3cc61 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -20,9 +20,7 @@ static void *alloc(void *actx, void *ptr, int n) fz_free(ctx, ptr); return NULL; } - if (ptr) - return fz_resize_array(ctx, ptr, n, 1); - return fz_malloc_array(ctx, n, 1); + return fz_resize_array_no_throw(ctx, ptr, n, 1); } static int eval_print(js_State *J, const char *source) |