From: Jonathan Dieter <jdieter@gmail.com>
Date: Wed, 11 Apr 2018 17:12:58 +0000 (+0300)
Subject: Finish last commit
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~327
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4bedc9e39bb40b77f46755c455e0b87ae371b129;p=zchunk.git

Finish last commit

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/src/lib/comp/comp.c b/src/lib/comp/comp.c
index 6b5e6fa..9d63973 100644
--- a/src/lib/comp/comp.c
+++ b/src/lib/comp/comp.c
@@ -128,6 +128,8 @@ int zck_comp_init(zckCtx *zck) {
             }
             zck_index_add_to_chunk(zck, dst, dst_size, 0);
             zck_index_finish_chunk(zck);
+            free(comp->dict);
+            comp->dict_size = 0;
             free(dst);
         } else {
             zck_index_finish_chunk(zck);
diff --git a/src/lib/zck.c b/src/lib/zck.c
index 50b45c8..c25049d 100644
--- a/src/lib/zck.c
+++ b/src/lib/zck.c
@@ -313,12 +313,12 @@ int zck_import_dict(zckCtx *zck) {
     zck_log(ZCK_LOG_DEBUG, "Resetting compression\n");
     if(!zck_comp_reset(zck))
         return False;
-    zck_log(ZCK_LOG_DEBUG, "setting dict 1\n");
-    if(!zck_set_comp_parameter(zck, ZCK_COMMON_DICT, data))
-        return False;
-    zck_log(ZCK_LOG_DEBUG, "setting dict 2\n");
+    zck_log(ZCK_LOG_DEBUG, "Setting dict size\n");
     if(!zck_set_comp_parameter(zck, ZCK_COMMON_DICT_SIZE, &size))
         return False;
+    zck_log(ZCK_LOG_DEBUG, "Setting dict\n");
+    if(!zck_set_comp_parameter(zck, ZCK_COMMON_DICT, data))
+        return False;
     if(!zck_comp_init(zck))
         return False;
     free(data);