Fix BC break of zend_throw_exception

twose · twose · commit 816d5eb9424d · 2020-06-06T05:06:26.000+08:00
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -851,9 +851,11 @@ static zend_object *zend_throw_exception_zstr(zend_class_entry *exception_ce, ze
 
 ZEND_API ZEND_COLD zend_object *zend_throw_exception(zend_class_entry *exception_ce, const char *message, zend_long code) /* {{{ */
 {
-	zend_string *msg_str = zend_string_init(message, strlen(message), 0);
+	zend_string *msg_str = message ? zend_string_init(message, strlen(message), 0) : NULL;
 	zend_object *ex = zend_throw_exception_zstr(exception_ce, msg_str, code);
-	zend_string_release(msg_str);
+	if (msg_str) {
+		zend_string_release(msg_str);
+	}
 	return ex;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -851,9 +851,11 @@ static zend_object zend_throw_exception_zstr(zend_class_entry exception_ce, ze`
`851`	`851`
`852`	`852`	`ZEND_API ZEND_COLD zend_object zend_throw_exception(zend_class_entry exception_ce, const char message, zend_long code) / {{{ */`
`853`	`853`	`{`
`854`		`- zend_string *msg_str = zend_string_init(message, strlen(message), 0);`
	`854`	`+ zend_string *msg_str = message ? zend_string_init(message, strlen(message), 0) : NULL;`
`855`	`855`	`zend_object *ex = zend_throw_exception_zstr(exception_ce, msg_str, code);`
`856`		`- zend_string_release(msg_str);`
	`856`	`+ if (msg_str) {`
	`857`	`+ zend_string_release(msg_str);`
	`858`	`+ }`
`857`	`859`	`return ex;`
`858`	`860`	`}`
`859`	`861`	`/* }}} */`