fixup! Improve error messages for invalid property access

Author: kocsismate

Zend/zend_API.c

@@ -133,7 +133,8 @@ ZEND_API const char *zend_get_type_by_const(int type) /* {{{ */
 ZEND_API const char *zend_zval_type_name(const zval *arg) /* {{{ */
 {
 	ZVAL_DEREF(arg);
-	return zend_get_type_by_const(Z_TYPE_P(arg));
+
+	return Z_ISUNDEF_P(arg) ? "null" : zend_get_type_by_const(Z_TYPE_P(arg));
 }
 /* }}} */
 

Zend/zend_execute.c

@@ -622,20 +622,20 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_throw_non_object_erro
 	 || opline->opcode == ZEND_POST_DEC_OBJ) {
 		zend_throw_error(NULL,
 			"Attempt to increment/decrement property '%s' on %s",
-			ZSTR_VAL(property_name), Z_ISUNDEF_P(object) ? "null" : zend_zval_type_name(object)
+			ZSTR_VAL(property_name), zend_zval_type_name(object)
 		);
 	} else if (opline->opcode == ZEND_FETCH_OBJ_W
 			|| opline->opcode == ZEND_FETCH_OBJ_RW
 			|| opline->opcode == ZEND_FETCH_OBJ_FUNC_ARG
 			|| opline->opcode == ZEND_ASSIGN_OBJ_REF) {
 		zend_throw_error(NULL,
 			"Attempt to modify property '%s' on %s",
-			ZSTR_VAL(property_name), Z_ISUNDEF_P(object) ? "null" : zend_zval_type_name(object)
+			ZSTR_VAL(property_name), zend_zval_type_name(object)
 		);
 	} else {
 		zend_throw_error(NULL,
 			"Attempt to assign property '%s' on %s",
-			ZSTR_VAL(property_name), Z_ISUNDEF_P(object) ? "null" : zend_zval_type_name(object)
+			ZSTR_VAL(property_name), zend_zval_type_name(object)
 		);
 	}
 	zend_tmp_string_release(tmp_property_name);
@@ -1503,9 +1503,7 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(z
 {
 	zend_string *tmp_property_name;
 	zend_string *property_name = zval_get_tmp_string(property, &tmp_property_name);
-	zend_error(E_WARNING, "Attempt to read property '%s' on %s",
-		ZSTR_VAL(property_name), Z_ISUNDEF_P(object) ? "null" : zend_zval_type_name(object)
-	);
+	zend_error(E_WARNING, "Attempt to read property '%s' on %s", ZSTR_VAL(property_name), zend_zval_type_name(object));
 	zend_tmp_string_release(tmp_property_name);
 }
 

ext/opcache/jit/zend_jit_helpers.c

@@ -1506,14 +1506,12 @@ static void ZEND_FASTCALL zend_jit_only_vars_by_reference(zval *arg)
 
 static void ZEND_FASTCALL zend_jit_invalid_array_access(zval *container)
 {
-	const char *type = Z_ISUNDEF_P(container) ? "null" : zend_zval_type_name(container);
-	zend_error(E_WARNING, "Trying to access array offset on value of type %s", type);
+	zend_error(E_WARNING, "Trying to access array offset on value of type %s", zend_zval_type_name(container));
 }
 
 static void ZEND_FASTCALL zend_jit_invalid_property_read(zval *container, char *property_name)
 {
-	const char *type = Z_ISUNDEF_P(container) ? "null" : zend_zval_type_name(container);
-	zend_error(E_WARNING, "Attempt to read property '%s' on %s", property_name, type);
+	zend_error(E_WARNING, "Attempt to read property '%s' on %s", property_name, zend_zval_type_name(container));
 }
 
 static zval * ZEND_FASTCALL zend_jit_prepare_assign_dim_ref(zval *ref) {