From: Jonathan Dieter Date: Mon, 3 Dec 2018 20:32:28 +0000 (+0000) Subject: Make sure we initialize hash if it hasn't been initialized yet X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~64 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17de9967808f0316a343f7a977ab7f7e59c9c164;p=zchunk.git Make sure we initialize hash if it hasn't been initialized yet Signed-off-by: Jonathan Dieter --- diff --git a/src/lib/comp/comp.c b/src/lib/comp/comp.c index 1a3ea55..cd23634 100644 --- a/src/lib/comp/comp.c +++ b/src/lib/comp/comp.c @@ -507,6 +507,10 @@ ssize_t comp_read(zckCtx *zck, char *dst, size_t dst_size, bool use_dict) { zck_log(ZCK_LOG_DDEBUG, "EOF"); finished_rd = true; } + if(&(zck->check_chunk_hash) == NULL) + if(!hash_init(zck, &(zck->check_chunk_hash), + &(zck->chunk_hash_type))) + goto hash_error; if(!hash_update(zck, &(zck->check_full_hash), src, rb) || !hash_update(zck, &(zck->check_chunk_hash), src, rb) || !comp_add_to_data(zck, &(zck->comp), src, rb)) @@ -709,6 +713,5 @@ ssize_t PUBLIC zck_get_chunk_data(zckChunk *idx, char *dst, if(!seek_data(zck, zck_get_chunk_start(idx), SEEK_SET)) return -1; zck->comp.data_idx = idx; - return comp_read(zck, dst, dst_size, 1); }