diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-08-22 11:58:23 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2018-08-22 19:38:10 +0800 |
| commit | a1feb3abb2821a0f8e00d146e6426ecdb9922b94 (patch) | |
| tree | 1db9ccd42ad4b8b01155a687b6759aa6e7322147 /source/pdf/pdf-run.c | |
| parent | 61574870c0fbe0bb76ea143f8b1ff38800fcdec7 (diff) | |
| download | mupdf-a1feb3abb2821a0f8e00d146e6426ecdb9922b94.tar.xz | |
Remove the old 'nested depth' tracking.
This was used to prevent infinite cycles in the Type3 font CharProcs,
but the previous commits forbids all cycles in order to prevent memory
leaks due to cyclic reference counts.
Diffstat (limited to 'source/pdf/pdf-run.c')
| -rw-r--r-- | source/pdf/pdf-run.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source/pdf/pdf-run.c b/source/pdf/pdf-run.c index c9e56622..4d607cc7 100644 --- a/source/pdf/pdf-run.c +++ b/source/pdf/pdf-run.c @@ -33,7 +33,7 @@ pdf_run_annot_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *page, pdf fz_try(ctx) { - proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, 0, default_cs); + proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, default_cs); pdf_process_annot(ctx, proc, doc, page, annot, cookie); pdf_close_processor(ctx, proc); } @@ -96,7 +96,7 @@ pdf_run_page_contents_with_usage(fz_context *ctx, pdf_document *doc, pdf_page *p colorspace = NULL; } - proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, 0, default_cs); + proc = pdf_new_run_processor(ctx, dev, ctm, usage, NULL, default_cs); pdf_process_contents(ctx, proc, doc, resources, contents, cookie); pdf_close_processor(ctx, proc); } @@ -227,14 +227,11 @@ pdf_run_page(fz_context *ctx, pdf_page *page, fz_device *dev, fz_matrix ctm, fz_ } void -pdf_run_glyph(fz_context *ctx, pdf_document *doc, pdf_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate, int nested_depth, fz_default_colorspaces *default_cs) +pdf_run_glyph(fz_context *ctx, pdf_document *doc, pdf_obj *resources, fz_buffer *contents, fz_device *dev, fz_matrix ctm, void *gstate, fz_default_colorspaces *default_cs) { pdf_processor *proc; - if (nested_depth > 10) - fz_throw(ctx, FZ_ERROR_GENERIC, "Too many nestings of Type3 glyphs"); - - proc = pdf_new_run_processor(ctx, dev, ctm, "View", gstate, nested_depth+1, default_cs); + proc = pdf_new_run_processor(ctx, dev, ctm, "View", gstate, default_cs); fz_try(ctx) { pdf_process_glyph(ctx, proc, doc, resources, contents); |