Convert getMessage() result to string

nikic · nikic · commit 0d137d6839b2 · 2020-05-25T12:10:41.000+02:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -414,8 +414,7 @@ ZEND_METHOD(Exception, getMessage)
 	ZEND_PARSE_PARAMETERS_NONE();
 
 	prop = GET_PROPERTY(ZEND_THIS, ZEND_STR_MESSAGE);
-	ZVAL_DEREF(prop);
-	ZVAL_COPY(return_value, prop);
+	RETURN_STR(zval_get_string(prop));
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -414,8 +414,7 @@ ZEND_METHOD(Exception, getMessage)`
`414`	`414`	`ZEND_PARSE_PARAMETERS_NONE();`
`415`	`415`
`416`	`416`	`prop = GET_PROPERTY(ZEND_THIS, ZEND_STR_MESSAGE);`
`417`		`- ZVAL_DEREF(prop);`
`418`		`- ZVAL_COPY(return_value, prop);`
	`417`	`+ RETURN_STR(zval_get_string(prop));`
`419`	`418`	`}`
`420`	`419`	`/* }}} */`
`421`	`420`