encode: opentelemetry: release spans on exception (CID 507645)

Signed-off-by: Eduardo Silva <[email protected]>
fluent · Oct 14, 2024 · aa0c168 · aa0c168
1 parent 9e4e1e2
commit aa0c168
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/ctr_encode_opentelemetry.c b/src/ctr_encode_opentelemetry.c
@@ -34,6 +34,8 @@ static inline void otlp_array_destroy(Opentelemetry__Proto__Common__V1__ArrayVal
 
 static inline void otlp_kvpair_list_destroy(Opentelemetry__Proto__Common__V1__KeyValue **pair_list, size_t entry_count);
 
+static void destroy_spans(Opentelemetry__Proto__Trace__V1__Span **spans, size_t count);
+
 static inline void otlp_kvpair_destroy(Opentelemetry__Proto__Common__V1__KeyValue *kvpair)
 {
     if (kvpair != NULL) {
@@ -425,8 +427,7 @@ static inline Opentelemetry__Proto__Common__V1__AnyValue *ctr_variant_string_to_
 
         if (result->string_value == NULL) {
             otlp_any_value_destroy(result);
-
-            result = NULL;
+            return NULL;
         }
     }
 
@@ -484,8 +485,8 @@ static inline Opentelemetry__Proto__Common__V1__AnyValue *ctr_variant_binary_to_
 
         if (result->bytes_value.data == NULL) {
             otlp_any_value_destroy(result);
-
             result = NULL;
+
         }
 
         memcpy(result->bytes_value.data, value->data.as_bytes, result->bytes_value.len);
@@ -884,6 +885,9 @@ static Opentelemetry__Proto__Trace__V1__Span **set_spans(struct ctrace_scope_spa
 
         otel_span = initialize_span();
         if (!otel_span) {
+            if (span_index > 0) {
+                destroy_spans(spans, span_index);
+            }
             return NULL;
         }