ensure zend_function* passed to nr_php_wraprec_lookup_get is never NULL

lavarou · lavarou · commit 7ae06753f2ae · 2025-04-22T13:01:09.000-04:00
diff --git a/agent/php_user_instrument.c b/agent/php_user_instrument.c
@@ -712,6 +712,9 @@ void nr_php_user_function_add_declared_callback(const char* namestr,
 
 #if ZEND_MODULE_API_NO >= ZEND_7_4_X_API_NO
 nruserfn_t* nr_php_get_wraprec(zend_function* zf) {
+  if (nrunlikely(NULL == zf)) {
+    return NULL;
+  }
   return nr_php_wraprec_lookup_get(zf);
 }
 #else

Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,9 @@ void nr_php_user_function_add_declared_callback(const char* namestr,`
`712`	`712`
`713`	`713`	`#if ZEND_MODULE_API_NO >= ZEND_7_4_X_API_NO`
`714`	`714`	`nruserfn_t* nr_php_get_wraprec(zend_function* zf) {`
	`715`	`+ if (nrunlikely(NULL == zf)) {`
	`716`	`+ return NULL;`
	`717`	`+ }`
`715`	`718`	`return nr_php_wraprec_lookup_get(zf);`
`716`	`719`	`}`
`717`	`720`	`#else`