From 08b3025f9355e53157fadc803fd942debc86d5a2 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 23 Jun 2010 11:54:28 +0200 Subject: Improve error case cleanup in pdf_font. --- mupdf/pdf_font.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c index 221ff396..f396bc59 100644 --- a/mupdf/pdf_font.c +++ b/mupdf/pdf_font.c @@ -522,10 +522,9 @@ loadsimplefont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict) return fz_okay; cleanup: - if (etable) + if (etable != fontdesc->cidtogid) fz_free(etable); - fz_dropfont(fontdesc->font); - fz_free(fontdesc); + pdf_dropfont(fontdesc); return fz_rethrow(error, "cannot load simple font (%d %d R)", fz_tonum(dict), fz_togen(dict)); } @@ -804,8 +803,7 @@ loadcidfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *enco return fz_okay; cleanup: - fz_dropfont(fontdesc->font); - fz_free(fontdesc); + pdf_dropfont(fontdesc); return fz_rethrow(error, "cannot load cid font (%d %d R)", fz_tonum(dict), fz_togen(dict)); } -- cgit v1.2.3