diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-28 11:38:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-28 11:38:20 -0700 |
| commit | fcd195aa6471e928ded99ba9b4367105f51bc83c (patch) | |
| tree | 8066a62eb19c488e9198941c77ef50773870a6a3 | |
| parent | f281a315f7acaefba0dc1699bf15c009b6d8a0ae (diff) | |
| parent | 180db42a90eac0a28403bd2d010e9a28f26a1b1e (diff) | |
| download | php-git-fcd195aa6471e928ded99ba9b4367105f51bc83c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix SOAP for uninitialzed object
| -rw-r--r-- | ext/soap/soap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 32bf5ca6f6..0453dc28e0 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -151,7 +151,9 @@ static void soap_error_handler(int error_num, const char *error_filename, const if (zend_hash_find(Z_OBJPROP_P(this_ptr),"service", sizeof("service"), (void **)&tmp) != FAILURE) { \ ss = (soapServicePtr)zend_fetch_resource(tmp TSRMLS_CC, -1, "service", NULL, 1, le_service); \ } else { \ - ss = NULL; \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can not fetch service object"); \ + SOAP_SERVER_END_CODE(); \ + return; \ } \ } |