Fix behaviour of changing type of op if non-ascii

Author: Girgias

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

@@ -32,9 +32,7 @@ DONE
 --EXPECT--
 string(1) "1"
 string(50) "Increment on non-alphanumeric string is deprecated"
-object(stdClass)#3 (0) {
-}
+string(4) "foo!"
 string(50) "Increment on non-alphanumeric string is deprecated"
-object(stdClass)#3 (0) {
-}
+string(1) "!"
 DONE

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

@@ -24,13 +24,7 @@ var_dump($x);
 DONE
 --EXPECT--
 string(50) "Increment on non-alphanumeric string is deprecated"
-object(GMP)#2 (1) {
-  ["num"]=>
-  string(2) "10"
-}
+string(4) "foo!"
 string(50) "Increment on non-alphanumeric string is deprecated"
-object(GMP)#2 (1) {
-  ["num"]=>
-  string(2) "10"
-}
+string(1) "!"
 DONE

Zend/zend_operators.c

@@ -2527,14 +2527,18 @@ static bool ZEND_FASTCALL increment_string(zval *str) /* {{{ */
 	}
 
 	if (UNEXPECTED(!zend_string_only_has_ascii_alphanumeric(Z_STR_P(str)))) {
+		zend_string *zstr = Z_STR_P(str);
+		GC_TRY_ADDREF(zstr);
 		zend_error(E_DEPRECATED, "Increment on non-alphanumeric string is deprecated");
 		if (EG(exception)) {
+			GC_TRY_DELREF(zstr);
+			if (!GC_REFCOUNT(zstr)) {
+				efree(zstr);
+			}
 			return false;
 		}
-		/* A userland error handler can change the type from string to something else */
-		if (Z_TYPE_P(str) != IS_STRING) {
-			return false;
-		}
+		zval_ptr_dtor(str);
+		ZVAL_STR(str, zstr);
 	}
 
 	if (!Z_REFCOUNTED_P(str)) {