inc/dec with undefined vars

Author: Girgias

Zend/tests/in-de-crement/incdec_undefined_vars_exception.phpt

@@ -0,0 +1,52 @@
+--TEST--
+Inc/dec on undefined variable: warning converted to exception
+--FILE--
+<?php
+
+set_error_handler(function($severity, $m) {
+    static $count = 0;
+    // Ignore the warning when we are var_dumping in the catch
+    if ($count++ % 2 == 0) {
+        throw new Exception($m, $severity);
+    }
+});
+
+unset($x);
+try {
+    $x++;
+} catch (\Exception $e) {
+    echo $e->getMessage(), PHP_EOL;
+    var_dump($x);
+}
+unset($x);
+try {
+    $x--;
+} catch (\Exception $e) {
+    echo $e->getMessage(), PHP_EOL;
+    var_dump($x);
+}
+unset($x);
+try {
+    ++$x;
+} catch (\Exception $e) {
+    echo $e->getMessage(), PHP_EOL;
+    var_dump($x);
+}
+unset($x);
+try {
+    --$x;
+} catch (\Exception $e) {
+    echo $e->getMessage(), PHP_EOL;
+    var_dump($x);
+}
+unset($x);
+?>
+--EXPECT--
+Undefined variable $x
+NULL
+Undefined variable $x
+NULL
+Undefined variable $x
+NULL
+Undefined variable $x
+NULL

Zend/zend_vm_def.h

@@ -1487,6 +1487,9 @@ ZEND_VM_HELPER(zend_pre_inc_helper, VAR|CV, ANY)
 	SAVE_OPLINE();
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
+		if (UNEXPECTED(EG(exception))) {
+			HANDLE_EXCEPTION();
+		}
 		ZVAL_NULL(var_ptr);
 	}
 
@@ -1541,6 +1544,9 @@ ZEND_VM_HELPER(zend_pre_dec_helper, VAR|CV, ANY)
 	SAVE_OPLINE();
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
+		if (UNEXPECTED(EG(exception))) {
+			HANDLE_EXCEPTION();
+		}
 		ZVAL_NULL(var_ptr);
 	}
 
@@ -1596,6 +1602,9 @@ ZEND_VM_HELPER(zend_post_inc_helper, VAR|CV, ANY)
 	SAVE_OPLINE();
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
+		if (UNEXPECTED(EG(exception))) {
+			HANDLE_EXCEPTION();
+		}
 		ZVAL_NULL(var_ptr);
 	}
 
@@ -1647,6 +1656,9 @@ ZEND_VM_HELPER(zend_post_dec_helper, VAR|CV, ANY)
 	SAVE_OPLINE();
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
+		if (UNEXPECTED(EG(exception))) {
+			HANDLE_EXCEPTION();
+		}
 		ZVAL_NULL(var_ptr);
 	}