Fix segmentation fault

estringana · estringana · commit a3b8609d5bd2 · 2024-12-12T17:27:21.000+01:00
diff --git a/ext/ddappsec.c b/ext/ddappsec.c
@@ -14,6 +14,10 @@ void ddtrace_appsec_minit() {
 }
 
 DDTRACE_PUBLIC void ddtrace_emit_asm_event() {
+    if (!DDTRACE_G(active_stack)) {
+        return;
+    }
+
     DDTRACE_G(asm_event_emitted) = true;
 
     zval _1_zval;
diff --git a/ext/tracer_tag_propagation/tracer_tag_propagation.c b/ext/tracer_tag_propagation/tracer_tag_propagation.c
@@ -100,12 +100,11 @@ static zend_array *ddtrace_get_root_meta() {
 }
 
 zval *ddtrace_propagated_tags_get_tag(const char *tag) {
-    zend_array *propagated = ddtrace_get_propagated();
-    zend_array *root_meta = ddtrace_get_root_meta();
-
     if (!tag) {
         return NULL;
     }
+    zend_array *propagated = ddtrace_get_propagated();
+    zend_array *root_meta = ddtrace_get_root_meta();
     size_t tag_len = strlen(tag);
 
     if (!zend_hash_str_find(propagated, tag, tag_len)) {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ void ddtrace_appsec_minit() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`DDTRACE_PUBLIC void ddtrace_emit_asm_event() {`
	`17`	`+ if (!DDTRACE_G(active_stack)) {`
	`18`	`+ return;`
	`19`	`+ }`
	`20`	`+`
`17`	`21`	`DDTRACE_G(asm_event_emitted) = true;`
`18`	`22`
`19`	`23`	`zval _1_zval;`
Original file line number	Diff line number	Diff line change
`@@ -100,12 +100,11 @@ static zend_array *ddtrace_get_root_meta() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`zval ddtrace_propagated_tags_get_tag(const char tag) {`
`103`		`- zend_array *propagated = ddtrace_get_propagated();`
`104`		`- zend_array *root_meta = ddtrace_get_root_meta();`
`105`		`-`
`106`	`103`	`if (!tag) {`
`107`	`104`	`return NULL;`
`108`	`105`	`}`
	`106`	`+ zend_array *propagated = ddtrace_get_propagated();`
	`107`	`+ zend_array *root_meta = ddtrace_get_root_meta();`
`109`	`108`	`size_t tag_len = strlen(tag);`
`110`	`109`
`111`	`110`	`if (!zend_hash_str_find(propagated, tag, tag_len)) {`