]> granicus.if.org Git - php/commitdiff
Partially revert "Fix uninitialized value condition"
authorNikita Popov <nikic@php.net>
Sun, 22 Mar 2015 08:24:56 +0000 (09:24 +0100)
committerNikita Popov <nikic@php.net>
Sun, 22 Mar 2015 08:25:32 +0000 (09:25 +0100)
This reverts commit e874f76096a346c5ee073c8aaf252d916f3be925,
which broke zpp quite mode.

Only the initialization of the "severity" variable is retained.

Zend/zend_API.c

index 58065d3ab70f786437df6fdbb4846d36c23dc0ea..6dd7bcae5e1e5bb5c15ba0ef949ccefba124d937 100644 (file)
@@ -711,7 +711,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
                                if (zend_fcall_info_init(arg, 0, fci, fcc, NULL, &is_callable_error) == SUCCESS) {
                                        if (is_callable_error) {
                                                *severity = E_STRICT;
-                                               zend_wrong_callback_error(E_STRICT, arg_num, is_callable_error);
+                                               zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error);
                                                efree(is_callable_error);
                                                *spec = spec_walk;
                                                return "";
@@ -720,7 +720,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
                                } else {
                                        if (is_callable_error) {
                                                *severity = E_EXCEPTION | E_ERROR;
-                                               zend_wrong_callback_error(E_EXCEPTION | E_ERROR, arg_num, is_callable_error);
+                                               zend_spprintf(error, 0, "to be a valid callback, %s", is_callable_error);
                                                efree(is_callable_error);
                                                return "";
                                        } else {