Check for undef var in typed property assignment

Without this check the assignment would actually silently succeed, not just skip the warning.
php · Sep 21, 2021 · f4bcf8c · f4bcf8c
1 parent 48d050e
commit f4bcf8c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c
@@ -2162,6 +2162,13 @@ static void ZEND_FASTCALL zend_jit_assign_to_typed_prop(zval *property_val, zend
 	zend_execute_data *execute_data = EG(current_execute_data);
 	zval tmp;
 
+	if (UNEXPECTED(Z_TYPE_P(value) == IS_UNDEF)) {
+		const zend_op *op_data = execute_data->opline + 1;
+		ZEND_ASSERT(op_data->opcode == ZEND_OP_DATA && op_data->op1_type == IS_CV);
+		zend_jit_undefined_op_helper(op_data->op1.var);
+		value = &EG(uninitialized_zval);
+	}
+
 	ZVAL_DEREF(value);
 	ZVAL_COPY(&tmp, value);
 

diff --git a/ext/opcache/tests/jit/assign_obj_002.phpt b/ext/opcache/tests/jit/assign_obj_002.phpt
@@ -10,16 +10,27 @@ opcache.jit=function
 <?php
 class Test {
     public $prop;
+    public int $prop2;
 }
 function test() {
     $o = new Test;
     $o->prop = $undef;
     var_dump($o->prop);
 }
+function test2() {
+    $o = new Test;
+    $o->prop2 = $undef;
+}
 test();
+try {
+    test2();
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
-DONE
 --EXPECTF--
-Warning: Undefined variable $undef in %sassign_obj_002.php on line 7
+Warning: Undefined variable $undef in %s on line %d
 NULL
-DONE
+
+Warning: Undefined variable $undef in %s on line %d
+Cannot assign null to property Test::$prop2 of type int