diff options
Diffstat (limited to 'source/fitz/filter-flate.c')
| -rw-r--r-- | source/fitz/filter-flate.c | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/source/fitz/filter-flate.c b/source/fitz/filter-flate.c index a7bbb273..b986a228 100644 --- a/source/fitz/filter-flate.c +++ b/source/fitz/filter-flate.c @@ -102,34 +102,24 @@ close_flated(fz_context *ctx, void *state_) fz_stream * fz_open_flated(fz_context *ctx, fz_stream *chain, int window_bits) { - fz_inflate_state *state = NULL; - int code = Z_OK; + fz_inflate_state *state; + int code; - fz_var(code); - fz_var(state); + state = fz_malloc_struct(ctx, fz_inflate_state); + state->z.zalloc = zalloc_flate; + state->z.zfree = zfree_flate; + state->z.opaque = ctx; + state->z.next_in = NULL; + state->z.avail_in = 0; - fz_try(ctx) - { - state = fz_malloc_struct(ctx, fz_inflate_state); - state->chain = chain; - - state->z.zalloc = zalloc_flate; - state->z.zfree = zfree_flate; - state->z.opaque = ctx; - state->z.next_in = NULL; - state->z.avail_in = 0; - - code = inflateInit2(&state->z, window_bits); - if (code != Z_OK) - fz_throw(ctx, FZ_ERROR_GENERIC, "zlib error: inflateInit: %s", state->z.msg); - } - fz_catch(ctx) + code = inflateInit2(&state->z, window_bits); + if (code != Z_OK) { - if (state && code == Z_OK) - inflateEnd(&state->z); fz_free(ctx, state); - fz_drop_stream(ctx, chain); - fz_rethrow(ctx); + fz_throw(ctx, FZ_ERROR_GENERIC, "zlib error: inflateInit2 failed"); } + + state->chain = fz_keep_stream(ctx, chain); + return fz_new_stream(ctx, state, next_flated, close_flated); } |