com php-src: check for EG(excepton): ext/soap/php_encoding. c
| From: | Dmitry Stogov | Date: | Thu, 15 May 2014 14:17:49 +0000 |
| Subject: | com php-src: check for EG(excepton): ext/soap/php_encoding. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78380@lists.php.net to get a copy of this message | ||
Commit: fba70c836294b33e1403b06a1c75746c78bb9b61
Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 May 2014 18:17:49 +0400
Parents: 3610c5cf02d011c10beabeeabb38b39e6c00d872
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fba70c836294b33e1403b06a1c75746c78bb9b61
Log:
check for EG(excepton)
Changed paths:
M ext/soap/php_encoding.c
Diff:
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 5b4ed23..29ca2ab 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -642,11 +642,11 @@ zval *to_zval_user(zval *ret, encodeTypePtr type, xmlNodePtr node TSRMLS_DC)
ZVAL_STRING(&data, (char*)xmlBufferContent(buf));
xmlBufferFree(buf);
xmlFreeNode(copy);
-
- ZVAL_NULL(ret);
if (call_user_function(EG(function_table), NULL, &type->map->to_zval, ret, 1, &data
TSRMLS_CC) == FAILURE) {
soap_error0(E_ERROR, "Encoding: Error calling from_xml callback");
+ } else if (EG(exception)) {
+ ZVAL_NULL(ret);
}
zval_ptr_dtor(&data);
} else {