Merge pull request #29 from msantos/bad_hdr_binary

Bad hdr binary

Author: darach

c_src/hdr_histogram_log.c

@@ -448,7 +448,7 @@ int hdr_encode_compressed(
             len = new_len;
 
             // Flush the zlib stream.  Breaks without this.
-            if (deflate(&strm, Z_SYNC_FLUSH) != Z_OK)
+            if (strm.avail_in > 0 && deflate(&strm, Z_SYNC_FLUSH) != Z_OK)
             {
                 FAIL_AND_CLEANUP(cleanup, result, HDR_DEFLATE_FAIL);
             }

c_src/hdr_histogram_nif.c

@@ -874,6 +874,11 @@ ERL_NIF_TERM _hh_to_binary(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     uint8_t* data = NULL;
     int success = hdr_encode_compressed(ctx->data, &data, &size);
 
+    if (success != 0)
+    {
+        return make_error(env, "bad_hdr_binary");
+    }
+
     if (!enif_alloc_binary(size, &target))
     {
         return make_error(env, "bad_hdr_binary_alloc");
@@ -882,11 +887,6 @@ ERL_NIF_TERM _hh_to_binary(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
     memcpy(target.data,data,size);
     free(data);
 
-    if (success != 0)
-    {
-        return make_error(env, "bad_hdr_binary");
-    }
-
     return enif_make_binary(env, &target);
 }
 

test/hdr_histogram_SUITE.erl

@@ -30,6 +30,7 @@
 -export([t_counter_example_stddev/1]).
 -export([t_issue_004/1]).
 -export([t_issue_013/1]).
+-export([t_issue_021/1]).
 -export([t_unique_resource_types/1]).
 -export([t_use_after_close/1]).
 
@@ -61,7 +62,7 @@ groups() ->
       , t_hdr_reset
       , t_hdr_close
       , t_hdr_binary
-      , t_hdr_binary_nc %% Commented out. Issues arize when used with CT
+      , t_hdr_binary_nc
     ]},
      {iter, [], [
         t_iter_recorded
@@ -76,6 +77,7 @@ groups() ->
     {regression, [], [
         t_issue_004,
         t_issue_013,
+        t_issue_021,
         t_unique_resource_types,
         t_use_after_close
     ]}].
@@ -304,6 +306,13 @@ t_issue_013(_Config) ->
     end || X <- lists:seq(0,10) ],
     {error, value_out_of_range} = hdr_histogram:record(R, -1),
     {error, value_out_of_range} = hdr_histogram:record(R, 11).
+
+t_issue_021(_Config) ->
+    {ok, H1} = hdr_histogram:open(524287, 5),
+    Bin = hdr_histogram:to_binary(H1),
+    {ok, H2} = hdr_histogram:from_binary(Bin),
+    Bin = hdr_histogram:to_binary(H2).
+
 
 t_unique_resource_types(_Config) ->
     {ok, H} = hdr_histogram:open(10, 1),