diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2017-09-08 17:35:28 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2017-09-12 20:51:45 +0800 |
| commit | 1535230e8483b43b8b4c2146ec8ba5d5b6bfc0cc (patch) | |
| tree | 2bcb5c09ef1d6831ab5e51f99667fc0d40766b34 /source | |
| parent | 1ee558b4c2f84e983cc6befe203bc7b7eab95e00 (diff) | |
| download | mupdf-1535230e8483b43b8b4c2146ec8ba5d5b6bfc0cc.tar.xz | |
Fix leaks upon error while copying array/dict.
Diffstat (limited to 'source')
| -rw-r--r-- | source/pdf/pdf-object.c | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/source/pdf/pdf-object.c b/source/pdf/pdf-object.c index 7dc73216..2d60edf1 100644 --- a/source/pdf/pdf-object.c +++ b/source/pdf/pdf-object.c @@ -611,8 +611,14 @@ pdf_copy_array(fz_context *ctx, pdf_obj *obj) n = pdf_array_len(ctx, obj); arr = pdf_new_array(ctx, doc, n); - for (i = 0; i < n; i++) - pdf_array_push(ctx, arr, pdf_array_get(ctx, obj, i)); + fz_try(ctx) + for (i = 0; i < n; i++) + pdf_array_push(ctx, arr, pdf_array_get(ctx, obj, i)); + fz_catch(ctx) + { + pdf_drop_obj(ctx, arr); + fz_rethrow(ctx); + } return arr; } @@ -966,8 +972,14 @@ pdf_copy_dict(fz_context *ctx, pdf_obj *obj) doc = DICT(obj)->doc; n = pdf_dict_len(ctx, obj); dict = pdf_new_dict(ctx, doc, n); - for (i = 0; i < n; i++) - pdf_dict_put(ctx, dict, pdf_dict_get_key(ctx, obj, i), pdf_dict_get_val(ctx, obj, i)); + fz_try(ctx) + for (i = 0; i < n; i++) + pdf_dict_put(ctx, dict, pdf_dict_get_key(ctx, obj, i), pdf_dict_get_val(ctx, obj, i)); + fz_catch(ctx) + { + pdf_drop_obj(ctx, dict); + fz_rethrow(ctx); + } return dict; } @@ -1559,10 +1571,16 @@ pdf_deep_copy_obj(fz_context *ctx, pdf_obj *obj) pdf_obj *dict = pdf_new_dict(ctx, doc, n); int i; - for (i = 0; i < n; i++) + fz_try(ctx) + for (i = 0; i < n; i++) + { + pdf_obj *obj_copy = pdf_deep_copy_obj(ctx, pdf_dict_get_val(ctx, obj, i)); + pdf_dict_put_drop(ctx, dict, pdf_dict_get_key(ctx, obj, i), obj_copy); + } + fz_catch(ctx) { - pdf_obj *obj_copy = pdf_deep_copy_obj(ctx, pdf_dict_get_val(ctx, obj, i)); - pdf_dict_put_drop(ctx, dict, pdf_dict_get_key(ctx, obj, i), obj_copy); + pdf_drop_obj(ctx, dict); + fz_rethrow(ctx); } return dict; @@ -1574,10 +1592,16 @@ pdf_deep_copy_obj(fz_context *ctx, pdf_obj *obj) pdf_obj *arr = pdf_new_array(ctx, doc, n); int i; - for (i = 0; i < n; i++) + fz_try(ctx) + for (i = 0; i < n; i++) + { + pdf_obj *obj_copy = pdf_deep_copy_obj(ctx, pdf_array_get(ctx, obj, i)); + pdf_array_push_drop(ctx, arr, obj_copy); + } + fz_catch(ctx) { - pdf_obj *obj_copy = pdf_deep_copy_obj(ctx, pdf_array_get(ctx, obj, i)); - pdf_array_push_drop(ctx, arr, obj_copy); + pdf_drop_obj(ctx, arr); + fz_rethrow(ctx); } return arr; |