diff options
| author | Robin Watts <robin.watts@artifex.com> | 2011-12-08 13:40:21 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2011-12-08 13:40:21 +0000 |
| commit | c114eac6b2d2e2c03bb6695d0087bb11ba829bb0 (patch) | |
| tree | d0e2955792415ea4ae2b7b733e4d161d7c59c50a /pdf/pdf_image.c | |
| parent | e9d1966e2427f630fb2a7c2a1d322ae35db6efc8 (diff) | |
| download | mupdf-c114eac6b2d2e2c03bb6695d0087bb11ba829bb0.tar.xz | |
Fix SEGV with "1439 - color softmask fails to draw jpx image.pdf"
Another missed fz_rethrow. Also, ensure that fz_drop_buffer copes
with NULL input.
Diffstat (limited to 'pdf/pdf_image.c')
| -rw-r--r-- | pdf/pdf_image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c index 41be8fac..b8785cf4 100644 --- a/pdf/pdf_image.c +++ b/pdf/pdf_image.c @@ -309,6 +309,7 @@ pdf_load_jpx_image(pdf_xref *xref, fz_obj *dict) if (colorspace) fz_drop_colorspace(ctx, colorspace); fz_drop_buffer(ctx, buf); + buf = NULL; obj = fz_dict_getsa(dict, "SMask", "Mask"); if (fz_is_dict(obj)) @@ -335,6 +336,7 @@ pdf_load_jpx_image(pdf_xref *xref, fz_obj *dict) fz_drop_colorspace(ctx, colorspace); fz_drop_buffer(ctx, buf); fz_drop_pixmap(ctx, img); + fz_rethrow(ctx); } return img; } |