shithub: jbig2

Info  •  Files  •  Log  •  Branches

Bug 697934: Fix SEGV due to error code being ignored.

The return code from jbig2_decode_text_region was being ignored so the
code continued to try and parse the invalid file using incomplete/empty
structures.

--- a/jbig2_symbol_dict.c

+++ b/jbig2_symbol_dict.c

@@ -493,8 +493,10 @@

                         }

                         /* multiple symbols are handled as a text region */

-                        jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts,

+                        code = jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts,

                                                  n_refagg_dicts, image, data, size, GR_stats, as, ws);

+                        if (code < 0)

+                            goto cleanup4;

                         SDNEWSYMS->glyphs[NSYMSDECODED] = image;

                         refagg_dicts[0]->glyphs[params->SDNUMINSYMS + NSYMSDECODED] = jbig2_image_clone(ctx, SDNEWSYMS->glyphs[NSYMSDECODED]);