com php-src: fix possible nullptr derefrence: ext/standard/basi c_functions.c

From: Date: Fri, 12 Sep 2014 20:18:06 +0000
Subject: com php-src: fix possible nullptr derefrence: ext/standard/basi c_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81537@lists.php.net to get a copy of this message
Commit: 7ac5a36a2f37b167d0114e6e2720086ba5c6c567 Author: Anatol Belski <ab@php.net> Fri, 12 Sep 2014 22:18:06 +0200 Parents: 8fc0f1a788ae5a67cc247d0f5734c214d567a3f5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7ac5a36a2f37b167d0114e6e2720086ba5c6c567 Log: fix possible nullptr derefrence Changed paths: M ext/standard/basic_functions.c Diff: diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index b45db8a..f37ae56 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4861,9 +4861,11 @@ static int user_shutdown_function_call(zval *zv TSRMLS_DC) /* {{{ */ zend_string *function_name; if (!zend_is_callable(&shutdown_function_entry->arguments[0], 0, &function_name TSRMLS_CC)) { - php_error(E_WARNING, "(Registered shutdown functions) Unable to call %s() - function does not exist", function_name->val); if (function_name) { + php_error(E_WARNING, "(Registered shutdown functions) Unable to call %s() - function does not exist", function_name->val); zend_string_release(function_name); + } else { + php_error(E_WARNING, "(Registered shutdown functions) Unable to call - function does not exist"); } return 0; }

« previous php.cvs (#81537) next »