summaryrefslogtreecommitdiff
path: root/source/fitz/memory.c
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2018-06-19 13:15:45 +0200
committerTor Andersson <tor.andersson@artifex.com>2018-06-22 16:23:34 +0200
commit3a263069d58416c251ef9f6a100a54be1e90dc0b (patch)
tree96a115f6b00eeb7c403d5a212e005ed26bc9e3cf /source/fitz/memory.c
parent502a9f1d230821d53fe9155a590f6b5f8a80ea2a (diff)
downloadmupdf-3a263069d58416c251ef9f6a100a54be1e90dc0b.tar.xz
Check pointer for NULL in fz_free before locking.
Diffstat (limited to 'source/fitz/memory.c')
-rw-r--r--source/fitz/memory.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/fitz/memory.c b/source/fitz/memory.c
index 09df7cda..8ba343e5 100644
--- a/source/fitz/memory.c
+++ b/source/fitz/memory.c
@@ -198,9 +198,12 @@ fz_resize_array_no_throw(fz_context *ctx, void *p, size_t count, size_t size)
void
fz_free(fz_context *ctx, void *p)
{
- fz_lock(ctx, FZ_LOCK_ALLOC);
- ctx->alloc->free(ctx->alloc->user, p);
- fz_unlock(ctx, FZ_LOCK_ALLOC);
+ if (p)
+ {
+ fz_lock(ctx, FZ_LOCK_ALLOC);
+ ctx->alloc->free(ctx->alloc->user, p);
+ fz_unlock(ctx, FZ_LOCK_ALLOC);
+ }
}
char *