Improve logic

danog · danog · commit 2a73299ff5fc · 2023-02-22T18:38:43.000+01:00
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -7082,7 +7082,7 @@ ZEND_METHOD(ReflectionFiber, getExecutingLine)
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	while (prev_execute_data && 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)) {
@@ -7106,7 +7106,7 @@ ZEND_METHOD(ReflectionFiber, getExecutingFile)
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	while (prev_execute_data && 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)) {

Original file line number	Diff line number	Diff line change
`@@ -7082,7 +7082,7 @@ ZEND_METHOD(ReflectionFiber, getExecutingLine)`
`7082`	`7082`	`prev_execute_data = fiber->execute_data->prev_execute_data;`
`7083`	`7083`	`}`
`7084`	`7084`
`7085`		`- while (prev_execute_data && prev_execute_data->func && !ZEND_USER_CODE(prev_execute_data->func->common.type)) {`
	`7085`	`+ while (prev_execute_data && (!prev_execute_data->func \|\| !ZEND_USER_CODE(prev_execute_data->func->common.type))) {`
`7086`	`7086`	`prev_execute_data = prev_execute_data->prev_execute_data;`
`7087`	`7087`	`}`
`7088`	`7088`	`if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {`
`@@ -7106,7 +7106,7 @@ ZEND_METHOD(ReflectionFiber, getExecutingFile)`
`7106`	`7106`	`prev_execute_data = fiber->execute_data->prev_execute_data;`
`7107`	`7107`	`}`
`7108`	`7108`
`7109`		`- while (prev_execute_data && prev_execute_data->func && !ZEND_USER_CODE(prev_execute_data->func->common.type)) {`
	`7109`	`+ while (prev_execute_data && (!prev_execute_data->func \|\| !ZEND_USER_CODE(prev_execute_data->func->common.type))) {`
`7110`	`7110`	`prev_execute_data = prev_execute_data->prev_execute_data;`
`7111`	`7111`	`}`
`7112`	`7112`	`if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {`