Return userland line and function if present

Author: danog

ext/reflection/php_reflection.c

@@ -7082,7 +7082,10 @@ ZEND_METHOD(ReflectionFiber, getExecutingLine)
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	if (prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+	while (prev_execute_data && prev_execute_data->func && !ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+		prev_execute_data = prev_execute_data->prev_execute_data;
+	}
+	if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
 		RETURN_LONG(prev_execute_data->opline->lineno);
 	}
 	RETURN_NULL();
@@ -7103,7 +7106,10 @@ ZEND_METHOD(ReflectionFiber, getExecutingFile)
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	if (prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+	while (prev_execute_data && prev_execute_data->func && !ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+		prev_execute_data = prev_execute_data->prev_execute_data;
+	}
+	if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
 		RETURN_STR_COPY(prev_execute_data->func->op_array.filename);
 	}
 	RETURN_NULL();

ext/reflection/tests/ReflectionFiber_notrace_2.phpt

@@ -16,8 +16,8 @@ var_dump($reflection->getTrace());
 
 ?>
 --EXPECTF--
-NULL
-NULL
+string(%d) "%sReflectionFiber_notrace_2.php"
+int(5)
 array(3) {
   [0]=>
   array(4) {