Merge branch 'PHP-8.0'

nikic · nikic · commit 6776e0557e4f · 2021-07-14T16:58:16.000+02:00
* PHP-8.0:
  Add exception check to zend_jit_fetch_obj_w_slow()
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -1568,6 +1568,10 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)
 			}
 			return;
 		}
+		if (UNEXPECTED(EG(exception))) {
+			ZVAL_ERROR(result);
+			return;
+		}
 	} else if (UNEXPECTED(Z_ISERROR_P(retval))) {
 		ZVAL_ERROR(result);
 		return;

Original file line number	Diff line number	Diff line change
`@@ -1568,6 +1568,10 @@ static void ZEND_FASTCALL zend_jit_fetch_obj_w_slow(zend_object *zobj)`
`1568`	`1568`	`}`
`1569`	`1569`	`return;`
`1570`	`1570`	`}`
	`1571`	`+ if (UNEXPECTED(EG(exception))) {`
	`1572`	`+ ZVAL_ERROR(result);`
	`1573`	`+ return;`
	`1574`	`+ }`
`1571`	`1575`	`} else if (UNEXPECTED(Z_ISERROR_P(retval))) {`
`1572`	`1576`	`ZVAL_ERROR(result);`
`1573`	`1577`	`return;`