From 6c85d80ff7e8b1074553a4f6fb895c3aecd3d6aa Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Tue, 2 Oct 2018 02:24:24 +0800 Subject: Don't clobber old xref section when pdf_replace_xref fails. --- source/pdf/pdf-xref.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'source/pdf/pdf-xref.c') diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index a792b7e2..03df63d7 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -513,45 +513,46 @@ void pdf_xref_ensure_incremental_object(fz_context *ctx, pdf_document *doc, int void pdf_replace_xref(fz_context *ctx, pdf_document *doc, pdf_xref_entry *entries, int n) { + int *xref_index = NULL; pdf_xref *xref = NULL; pdf_xref_subsec *sub; - pdf_obj *trailer = pdf_keep_obj(ctx, pdf_trailer(ctx, doc)); + fz_var(xref_index); fz_var(xref); + fz_try(ctx) { - fz_free(ctx, doc->xref_index); - doc->xref_index = NULL; /* In case the calloc fails */ - doc->xref_index = fz_calloc(ctx, n, sizeof(int)); + xref_index = fz_calloc(ctx, n, sizeof(int)); xref = fz_malloc_struct(ctx, pdf_xref); sub = fz_malloc_struct(ctx, pdf_xref_subsec); - - /* The new table completely replaces the previous separate sections */ - pdf_drop_xref_sections(ctx, doc); - - sub->table = entries; - sub->start = 0; - sub->len = n; - xref->subsec = sub; - xref->num_objects = n; - xref->trailer = trailer; - trailer = NULL; - - doc->xref_sections = xref; - doc->num_xref_sections = 1; - doc->num_incremental_sections = 0; - doc->xref_base = 0; - doc->disallow_new_increments = 0; - doc->max_xref_len = n; - - memset(doc->xref_index, 0, sizeof(int)*doc->max_xref_len); } fz_catch(ctx) { fz_free(ctx, xref); - pdf_drop_obj(ctx, trailer); + fz_free(ctx, xref_index); fz_rethrow(ctx); } + + sub->table = entries; + sub->start = 0; + sub->len = n; + + xref->subsec = sub; + xref->num_objects = n; + xref->trailer = pdf_keep_obj(ctx, pdf_trailer(ctx, doc)); + + /* The new table completely replaces the previous separate sections */ + pdf_drop_xref_sections(ctx, doc); + + doc->xref_sections = xref; + doc->num_xref_sections = 1; + doc->num_incremental_sections = 0; + doc->xref_base = 0; + doc->disallow_new_increments = 0; + doc->max_xref_len = n; + + fz_free(ctx, doc->xref_index); + doc->xref_index = xref_index; } void pdf_forget_xref(fz_context *ctx, pdf_document *doc) -- cgit v1.2.3