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 6b5e6fa4296b7944991e981eddaa5663d2bc05d3..9d63973234b0984227e39980c1dfc1b599797d83 100644 (file)
--- 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 50b45c87165dd0e66b717c8e8a610f76f14286d5..c25049d26196bc5eac17fc91893422f12ad9ef74 100644 (file)
--- 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);