diff options
| author | Shailesh Mistry <shailesh.mistry@hotmail.co.uk> | 2012-05-14 18:08:00 +0100 |
|---|---|---|
| committer | Shailesh Mistry <shailesh.mistry@hotmail.co.uk> | 2012-05-14 18:08:00 +0100 |
| commit | 26ac0d3505530c6782dffeeaa053328a481afcb0 (patch) | |
| tree | 2cc1650dbed54a00eef96ca8e10cfb3fcd5b79ba /gs/jbig2dec/jbig2_refinement.c | |
| parent | 2699766796d407f04e790ca1374f68be00532847 (diff) | |
Bug 693025: Updated patch from Zeniko to fix various crashes and leaks
Diffstat (limited to 'gs/jbig2dec/jbig2_refinement.c')
| -rw-r--r-- | gs/jbig2dec/jbig2_refinement.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/gs/jbig2dec/jbig2_refinement.c b/gs/jbig2dec/jbig2_refinement.c index 6b09ab844..840bfb1a0 100644 --- a/gs/jbig2dec/jbig2_refinement.c +++ b/gs/jbig2dec/jbig2_refinement.c @@ -435,6 +435,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, Jbig2RegionSegmentInfo rsi; int offset = 0; byte seg_flags; + int code = 0; /* 7.4.7 */ if (segment->data_length < 18) @@ -509,12 +510,14 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, Jbig2ArithCx *GR_stats = NULL; int stats_size; Jbig2Image *image = NULL; - int code; image = jbig2_image_new(ctx, rsi.width, rsi.height); if (image == NULL) - return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, - "unable to allocate refinement image"); + { + code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number, + "unable to allocate refinement image"); + goto cleanup; + } jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, "allocated %d x %d image buffer for region decode results", rsi.width, rsi.height); @@ -523,7 +526,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, GR_stats = jbig2_new(ctx, Jbig2ArithCx, stats_size); if (GR_stats == NULL) { - jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, + code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "failed to allocate GR-stats in jbig2_refinement_region"); goto cleanup; } @@ -533,7 +536,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, segment->data_length - offset); if (ws == NULL) { - jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, + code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "failed to allocate ws in jbig2_refinement_region"); goto cleanup; } @@ -541,7 +544,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, as = jbig2_arith_new(ctx, ws); if (as == NULL) { - jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, + code = jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1, "failed to allocate as in jbig2_refinement_region"); goto cleanup; } @@ -551,7 +554,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, if ((segment->flags & 63) == 40) { /* intermediate region. save the result for later */ - segment->result = image; + segment->result = jbig2_image_clone(ctx, image); } else { /* immediate region. composite onto the page */ jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, @@ -559,14 +562,15 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment, rsi.width, rsi.height, rsi.x, rsi.y); jbig2_page_add_result(ctx, &ctx->pages[ctx->current_page], image, rsi.x, rsi.y, rsi.op); - jbig2_image_release(ctx, image); } cleanup: + jbig2_image_release(ctx, image); + jbig2_image_release(ctx, params.reference); jbig2_free(ctx->allocator, as); jbig2_word_stream_buf_free(ctx, ws); jbig2_free(ctx->allocator, GR_stats); } - return 0; + return code; } |