Error when trying to increment/decrement object offsets

Author: Girgias

Zend/tests/offsets/increment_decrement_object_offset.phpt

@@ -65,28 +65,8 @@ foreach ([new Legacy(), new Container()] as $container) {
 ?>
 --EXPECTF--
 new Legacy()[0]
-string(20) "Legacy::offsetExists"
-string(17) "Legacy::offsetGet"
-
-Notice: Indirect modification of overloaded element of Legacy has no effect in %s on line %d
-int(15)
-string(17) "Legacy::offsetGet"
-int(15)
-string(20) "Legacy::offsetExists"
-string(17) "Legacy::offsetGet"
-
-Notice: Indirect modification of overloaded element of Legacy has no effect in %s on line %d
-int(15)
-string(17) "Legacy::offsetGet"
-int(15)
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new Container()[0]
-string(23) "Container::offsetExists"
-string(22) "Container::offsetFetch"
-int(15)
-string(20) "Container::offsetGet"
-int(16)
-string(23) "Container::offsetExists"
-string(22) "Container::offsetFetch"
-int(16)
-string(20) "Container::offsetGet"
-int(15)
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets

Zend/tests/offsets/increment_decrement_operation_order.phpt

@@ -61,61 +61,35 @@ STDERR[0]
 Error: Cannot use a scalar value as an array
 Error: Cannot use a scalar value as an array
 new stdClass()[0]
-Error: Cannot use object of type stdClass as array
-Error: Cannot use object of type stdClass as array
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new ArrayObject()[0]
-
-Warning: Undefined offset in %s on line %d
-NULL
-int(1)
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new A()[0]
-string(15) "A::offsetExists"
-int(0)
-string(12) "A::offsetGet"
-int(0)
-
-Notice: Indirect modification of overloaded element of A has no effect in %s on line %d
-int(5)
-string(15) "A::offsetExists"
-int(0)
-string(12) "A::offsetGet"
-int(0)
-
-Notice: Indirect modification of overloaded element of A has no effect in %s on line %d
-int(5)
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new B()[0]
-string(15) "B::offsetExists"
-int(0)
-NULL
-string(15) "B::offsetExists"
-int(0)
-int(1)
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionRead()[0]
-Error: Cannot fetch offset of object of type DimensionRead
-Error: Cannot fetch offset of object of type DimensionRead
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionFetch()[0]
-string(27) "DimensionRead::offsetExists"
-int(0)
-string(27) "DimensionFetch::offsetFetch"
-int(0)
-TypeError: Cannot increment DimensionFetch
-string(27) "DimensionRead::offsetExists"
-int(0)
-string(27) "DimensionFetch::offsetFetch"
-int(0)
-TypeError: Cannot decrement DimensionFetch
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionWrite()[0]
-Error: Cannot fetch offset of object of type DimensionWrite
-Error: Cannot fetch offset of object of type DimensionWrite
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionReadWrite()[0]
-Error: Cannot fetch offset of object of type DimensionReadWrite
-Error: Cannot fetch offset of object of type DimensionReadWrite
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionAppend()[0]
-Error: Cannot fetch offset of object of type DimensionAppend
-Error: Cannot fetch offset of object of type DimensionAppend
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionFetchAppend()[0]
-Error: Cannot fetch offset of object of type DimensionFetchAppend
-Error: Cannot fetch offset of object of type DimensionFetchAppend
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets
 new DimensionUnset()[0]
-Error: Cannot fetch offset of object of type DimensionUnset
-Error: Cannot fetch offset of object of type DimensionUnset
+Error: Cannot increment/decrement object offsets
+Error: Cannot increment/decrement object offsets

Zend/zend_vm_def.h

@@ -1956,7 +1956,23 @@ ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, CONST|TMPVAR|UNUSED|NEXT|CV)
 
 	SAVE_OPLINE();
 	container = GET_OP1_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
-	zend_fetch_dimension_address_RW(container, GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R), OP2_TYPE OPLINE_CC EXECUTE_DATA_CC);
+	if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {
+		const zend_op *next_opline = OPLINE + 1;
+		if (UNEXPECTED(
+			next_opline->opcode == ZEND_PRE_INC
+			|| next_opline->opcode == ZEND_PRE_DEC
+			|| next_opline->opcode == ZEND_POST_INC
+			|| next_opline->opcode == ZEND_POST_DEC
+		)) {
+			zend_throw_error(NULL, "Cannot increment/decrement object offsets");
+			ZVAL_UNDEF(EX_VAR(opline->result.var));
+		} else {
+			zend_fetch_dimension_address_RW(container, GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R), OP2_TYPE OPLINE_CC EXECUTE_DATA_CC);
+		}
+	} else {
+		zend_fetch_dimension_address_RW(container, GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R), OP2_TYPE OPLINE_CC EXECUTE_DATA_CC);
+	}
+
 	FREE_OP2();
 	if (OP1_TYPE == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);