diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:27:43 +0200 |
| commit | 97c5172ac78c056ba28199d907259376e7c3c3a2 (patch) | |
| tree | c27d0e0c2cb845a492530f9e7fe6be29da5a602a /ext/xmlrpc/xmlrpc-epi-php.c | |
| parent | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (diff) | |
| parent | 53c4c571b3d3b7891526ff616e69c4d74a04afe5 (diff) | |
| download | php-git-97c5172ac78c056ba28199d907259376e7c3c3a2.tar.gz | |
Merge remote-tracking branch 'php/master'
Conflicts:
ext/date/lib/parse_date.c
Diffstat (limited to 'ext/xmlrpc/xmlrpc-epi-php.c')
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 1c560f38d3..fe0c794d1d 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -504,8 +504,10 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep if (in_val) { zval val; + XMLRPC_VALUE_TYPE type; + ZVAL_UNDEF(&val); - XMLRPC_VALUE_TYPE type = get_zval_xmlrpc_type(in_val, &val); + type = get_zval_xmlrpc_type(in_val, &val); if (!Z_ISUNDEF(val)) { switch (type) { @@ -1116,6 +1118,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) { zval *handle, *desc; xmlrpc_server_data* server; + XMLRPC_VALUE xDesc; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ra", &handle, &desc) == FAILURE) { return; @@ -1123,7 +1126,7 @@ PHP_FUNCTION(xmlrpc_server_add_introspection_data) ZEND_FETCH_RESOURCE(server, xmlrpc_server_data*, handle, -1, "xmlrpc server", le_xmlrpc_server); - XMLRPC_VALUE xDesc = PHP_to_XMLRPC(desc TSRMLS_CC); + xDesc = PHP_to_XMLRPC(desc TSRMLS_CC); if (xDesc) { int retval = XMLRPC_ServerAddIntrospectionData(server->server_ptr, xDesc); XMLRPC_CleanupValue(xDesc); |