Fix a couple memory leaks (#3420)

bwoebi · web-flow · commit 4fb6495d3630 · 2025-09-22T16:23:13.000+02:00
* Fix some stuff

* Fix memory leak

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

* Properly fix php_stream_context freeing

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;

---------

Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/ext/handlers_httpstreams.c b/ext/handlers_httpstreams.c
@@ -29,7 +29,8 @@ static php_stream *dd_stream_opener(
     php_stream_wrapper *original_wrapper,
     DD_STREAM_OPENER_ARGS
 ) {
-    if (!context) {
+    bool temporary_context = !context;
+    if (temporary_context) {
         context = php_stream_context_alloc();
     }
 
@@ -98,6 +99,10 @@ static php_stream *dd_stream_opener(
 
     php_stream *stream = original_wrapper->wops->stream_opener(DD_STREAM_OPENER_CALL_ARGS);
 
+    if (temporary_context) {
+        zend_list_delete(context->res);
+    }
+
     if (span) {
         ddtrace_clear_execute_data_span((zend_ulong)-2, true);
     }
diff --git a/ext/serializer.c b/ext/serializer.c
@@ -1357,8 +1357,7 @@ static void _serialize_meta(ddog_SpanBytes *rust_span, ddtrace_span_data *span,
             dd_set_mapped_peer_service(rust_span, Z_STR_P(peer_service));
         } else if (zend_hash_num_elements(peer_service_sources) > 0) {
             zval *tag;
-            ZEND_HASH_FOREACH_VAL(peer_service_sources, tag)
-            {
+            ZEND_HASH_FOREACH_VAL(peer_service_sources, tag) {
                 if (Z_TYPE_P(tag) == IS_STRING) { // Use the first tag that is found in the span, if any
                     zval *peer_service = zend_hash_find(Z_ARRVAL_P(meta), Z_STR_P(tag));
                     if (peer_service && Z_TYPE_P(peer_service) == IS_STRING) {
@@ -1368,12 +1367,11 @@ static void _serialize_meta(ddog_SpanBytes *rust_span, ddtrace_span_data *span,
                         if (!dd_set_mapped_peer_service(rust_span, peer)) {
                             ddog_add_str_span_meta_zstr(rust_span, "peer.service", peer);
                         }
-
+                        zend_string_release(peer);
                         break;
                     }
                 }
-            }
-            ZEND_HASH_FOREACH_END();
+            } ZEND_HASH_FOREACH_END();
         }
     }
 
diff --git a/src/DDTrace/Integrations/Exec/ExecIntegration.php b/src/DDTrace/Integrations/Exec/ExecIntegration.php
@@ -110,8 +110,7 @@ static function (HookData $hook) {
             },
             static function (HookData $hook) {
                 /** @var SpanData $span */
-                $span = $hook->data;
-                if (!$span) {
+                if (!$span = $hook->data ?? null) {
                     return;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1357,8 +1357,7 @@ static void _serialize_meta(ddog_SpanBytes rust_span, ddtrace_span_data span,`
`1357`	`1357`	`dd_set_mapped_peer_service(rust_span, Z_STR_P(peer_service));`
`1358`	`1358`	`} else if (zend_hash_num_elements(peer_service_sources) > 0) {`
`1359`	`1359`	`zval *tag;`
`1360`		`- ZEND_HASH_FOREACH_VAL(peer_service_sources, tag)`
`1361`		`- {`
	`1360`	`+ ZEND_HASH_FOREACH_VAL(peer_service_sources, tag) {`
`1362`	`1361`	`if (Z_TYPE_P(tag) == IS_STRING) { // Use the first tag that is found in the span, if any`
`1363`	`1362`	`zval *peer_service = zend_hash_find(Z_ARRVAL_P(meta), Z_STR_P(tag));`
`1364`	`1363`	`if (peer_service && Z_TYPE_P(peer_service) == IS_STRING) {`
`@@ -1368,12 +1367,11 @@ static void _serialize_meta(ddog_SpanBytes rust_span, ddtrace_span_data span,`
`1368`	`1367`	`if (!dd_set_mapped_peer_service(rust_span, peer)) {`
`1369`	`1368`	`ddog_add_str_span_meta_zstr(rust_span, "peer.service", peer);`
`1370`	`1369`	`}`
`1371`		`-`
	`1370`	`+ zend_string_release(peer);`
`1372`	`1371`	`break;`
`1373`	`1372`	`}`
`1374`	`1373`	`}`
`1375`		`- }`
`1376`		`- ZEND_HASH_FOREACH_END();`
	`1374`	`+ } ZEND_HASH_FOREACH_END();`
`1377`	`1375`	`}`
`1378`	`1376`	`}`
`1379`	`1377`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,7 @@ static function (HookData $hook) {`
`110`	`110`	`},`
`111`	`111`	`static function (HookData $hook) {`
`112`	`112`	`/** @var SpanData $span */`
`113`		`- $span = $hook->data;`
`114`		`- if (!$span) {`
	`113`	`+ if (!$span = $hook->data ?? null) {`
`115`	`114`	`return;`
`116`	`115`	`}`
`117`	`116`