summaryrefslogtreecommitdiff
path: root/ext/xmlrpc/xmlrpc-epi-php.c
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2007-11-12 11:23:04 +0000
committerAntony Dovgal <tony2001@php.net>2007-11-12 11:23:04 +0000
commit1f1140a93a18cb242111e53cc0eff935763b7ea0 (patch)
tree537531950ae81138200f3f99db3c0cb58537dec8 /ext/xmlrpc/xmlrpc-epi-php.c
parentdd3c04cea194b0a4518b0afeef2f148f8b2680cd (diff)
downloadphp-git-1f1140a93a18cb242111e53cc0eff935763b7ea0.tar.gz
MFH: fix #42736 (xmlrpc_server_call_method() crashes)
Diffstat (limited to 'ext/xmlrpc/xmlrpc-epi-php.c')
-rw-r--r--ext/xmlrpc/xmlrpc-epi-php.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 423deb045f..f6fab62ed1 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -523,7 +523,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
break;
case HASH_KEY_IS_STRING:
case HASH_KEY_IS_LONG:
- ht = HASH_OF(*pIter);
+ ht = HASH_OF(*pIter);
if (ht) {
ht->nApplyCount++;
}
@@ -874,10 +874,9 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe
pData->php_executed = 1;
- zval_dtor(xmlrpc_params);
- FREE_ZVAL(xmlrpc_params);
+ zval_ptr_dtor(&xmlrpc_params);
- return NULL;
+ return NULL;
}
/* called by the C server when it first receives an introspection request. We pass this on to