From fba70c836294b33e1403b06a1c75746c78bb9b61 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 15 May 2014 18:17:49 +0400 Subject: [PATCH] check for EG(excepton) --- ext/soap/php_encoding.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index 5b4ed232d1..29ca2ab41d 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 { -- 2.50.1