com php-src: fix SOAP for uninitialzed object: ext/soap/soap.c
| From: | Stanislav Malyshev | Date: | Mon, 28 Jul 2014 18:38:06 +0000 |
| Subject: | com php-src: fix SOAP for uninitialzed object: ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79602@lists.php.net to get a copy of this message | ||
Commit: 180db42a90eac0a28403bd2d010e9a28f26a1b1e
Author: Stanislav Malyshev <stas@php.net> Sun, 27 Jul 2014 00:14:28 -0700
Parents: 7f865ffdd89c03a7dc5d2d4490b65b1b60ef4a31
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=180db42a90eac0a28403bd2d010e9a28f26a1b1e
Log:
fix SOAP for uninitialzed object
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 32bf5ca..0453dc2 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; \
} \
}