Check exception before using undef_result_after_exception()

undefined_op_helper_write() can return 0 not just if an exception is thrown, so check this explicitly. This fixes an issue introduced in fe1633f.
php · Sep 28, 2021 · 0391c55 · 0391c55
1 parent fe1633f
commit 0391c55
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -684,7 +684,9 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di
 			goto str_index;
 		case IS_UNDEF:
 			if (!zend_jit_undefined_op_helper_write(ht, EG(current_execute_data)->opline->op2.var)) {
-				undef_result_after_exception();
+				if (EG(exception)) {
+					undef_result_after_exception();
+				}
 				return NULL;
 			}
 			/* break missing intentionally */
@@ -769,7 +771,9 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim
 			goto str_index;
 		case IS_UNDEF:
 			if (!zend_jit_undefined_op_helper_write(ht, EG(current_execute_data)->opline->op2.var)) {
-				undef_result_after_exception();
+				if (EG(exception)) {
+					undef_result_after_exception();
+				}
 				return NULL;
 			}
 			/* break missing intentionally */