Merge pull request #41 from arnaud-lb/zend-pass-function

Fix crash on zend_pass_function encounters

Author: arnaud-lb

memprof.c

@@ -672,7 +672,9 @@ static void memprof_zend_execute_internal(zend_execute_data *execute_data_ptr, z
 {
 	int ignore = 0;
 
-	if (execute_data_ptr->func->common.function_name) {
+	if (execute_data_ptr->func == &zend_pass_function) {
+		ignore = 1;
+	} else if (execute_data_ptr->func->common.function_name) {
 		zend_string * name = execute_data_ptr->func->common.function_name;
 		if (ZSTR_LEN(name) == sizeof("call_user_func")-1
 				&& 0 == memcmp(name, "call_user_func", sizeof("call_user_func")))

tests/zend_pass_function.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Enable with environment variable
+--ENV--
+MEMPROF_PROFILE=1
+--FILE--
+<?php
+var_dump(memprof_enabled());
+
+class C {
+}
+
+$a = new C(1, 2, 3);
+
+var_dump($a);
+
+memprof_dump_array();
+--EXPECT--
+bool(true)
+object(C)#1 (0) {
+}

util.c

@@ -56,6 +56,10 @@ size_t get_function_name(zend_execute_data * execute_data, char * buf, size_t bu
 		return snprintf(buf, buf_size, "main");
 	}
 
+	if (execute_data->func == &zend_pass_function) {
+		return snprintf(buf, buf_size, "zend_pass_function");
+	}
+
 	zname = func->common.function_name;
 
 	if (zname == NULL) {