decode: msgpack: allow histograms with no buckets to be serialized

Signed-off-by: Leonardo Alminana <leonardo@calyptia.com>
fluent · Mar 31, 2023 · bce2f80 · bce2f80
1 parent b351beb
commit bce2f80
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/cmt_decode_msgpack.c b/src/cmt_decode_msgpack.c
@@ -876,10 +876,14 @@ static int unpack_meta_bucket(mpack_reader_t *reader, size_t index, void *contex
 
     decode_context = (struct cmt_msgpack_decode_context *) context;
 
+    if (decode_context->bucket_count == 0) {
+        return CMT_DECODE_MSGPACK_INVALID_ARGUMENT_ERROR;
+    }
+
     return cmt_mpack_consume_double_tag(reader, &decode_context->bucket_list[index]);
 }
 
-static int unpack_meta_buckets(mpack_reader_t *reader, size_t index, void *context)
+static int  unpack_meta_buckets(mpack_reader_t *reader, size_t index, void *context)
 {
     struct cmt_msgpack_decode_context *decode_context;
 
@@ -899,6 +903,7 @@ static int unpack_meta_buckets(mpack_reader_t *reader, size_t index, void *conte
         if (NULL == decode_context->bucket_list) {
             return CMT_DECODE_MSGPACK_ALLOCATION_ERROR;
         }
+
     }
 
     return cmt_mpack_unpack_array(reader, unpack_meta_bucket, context);
@@ -977,12 +982,17 @@ static int unpack_basic_type_meta(mpack_reader_t *reader, size_t index, void *co
         if (decode_context->map->type == CMT_HISTOGRAM) {
             histogram = (struct cmt_histogram *) decode_context->map->parent;
 
-            histogram->buckets =
-                cmt_histogram_buckets_create_size(decode_context->bucket_list,
-                                                  decode_context->bucket_count);
+            if (decode_context->bucket_count > 0) {
+                histogram->buckets =
+                    cmt_histogram_buckets_create_size(decode_context->bucket_list,
+                                                      decode_context->bucket_count);
 
-            if (histogram->buckets == NULL) {
-                result = CMT_DECODE_MSGPACK_ALLOCATION_ERROR;
+                if (histogram->buckets == NULL) {
+                    result = CMT_DECODE_MSGPACK_ALLOCATION_ERROR;
+                }
+            }
+            else {
+                histogram->buckets = NULL;
             }
         }
         else if (decode_context->map->type == CMT_SUMMARY) {
@@ -995,7 +1005,7 @@ static int unpack_basic_type_meta(mpack_reader_t *reader, size_t index, void *co
             decode_context->quantile_count = 0;
         }
         else if(decode_context->map->type == CMT_COUNTER) {
-            counter = (struct counter *) decode_context->map->parent;
+            counter = (struct cmt_counter *) decode_context->map->parent;
             counter->aggregation_type = decode_context->aggregation_type;
         }
     }