diff options
| author | twosee <twose@qq.com> | 2020-06-06 14:47:39 +0800 |
|---|---|---|
| committer | George Peter Banyard <girgias@php.net> | 2020-06-06 17:17:44 +0200 |
| commit | cb2275866dbc2a3aedfa7f216c6cb38653d67af6 (patch) | |
| tree | 54c5dd98f856d914c679633f00c14e664f281d69 /Zend/zend_exceptions.c | |
| parent | aa9b0ccda88531f9bb3f2149db002c5fcaaa7b14 (diff) | |
| download | php-git-cb2275866dbc2a3aedfa7f216c6cb38653d67af6.tar.gz | |
Fix BC break of zend_throw_exception
This also fixes a SegFault
Closes GH-5670
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 0204e14a58..57eb010821 100644 --- 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; } /* }}} */ |