From 33f9fc4ec85ba3a12efd6aa0e7bfd97d5e6c02a9 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sat, 29 Jan 2011 09:06:32 +0000 Subject: Don't try to copy arrays/dictionaries that are indirect references with fz_copyarray and fz_copydict. --- fitz/obj_array.c | 2 +- fitz/obj_dict.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fitz/obj_array.c b/fitz/obj_array.c index c07312cf..a85373d1 100644 --- a/fitz/obj_array.c +++ b/fitz/obj_array.c @@ -26,7 +26,7 @@ fz_copyarray(fz_obj *obj) fz_obj *new; int i; - if (!fz_isarray(obj)) + if (fz_isindirect(obj) || !fz_isarray(obj)) fz_warn("assert: not an array (%s)", fz_objkindstr(obj)); new = fz_newarray(fz_arraylen(obj)); diff --git a/fitz/obj_dict.c b/fitz/obj_dict.c index f5d3f733..d1cc22cc 100644 --- a/fitz/obj_dict.c +++ b/fitz/obj_dict.c @@ -48,7 +48,7 @@ fz_copydict(fz_obj *obj) fz_obj *new; int i; - if (!fz_isdict(obj)) + if (fz_isindirect(obj) || !fz_isdict(obj)) fz_throw("assert: not a dict (%s)", fz_objkindstr(obj)); new = fz_newdict(fz_dictlen(obj)); -- cgit v1.2.3