diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:38:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:53:50 +0200 |
| commit | 7686b0b88906e2522300b9e631ddde2051de839f (patch) | |
| tree | 31a3cfd1feaf6f7190bad8222a6f9da567acd723 /ext/xmlrpc/xmlrpc-epi-php.c | |
| parent | 03a9c2df7baea96a4777346c8799f0a6fdd7c882 (diff) | |
| parent | a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708 (diff) | |
| download | php-git-7686b0b88906e2522300b9e631ddde2051de839f.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/xmlrpc/xmlrpc-epi-php.c')
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 8d9ff87611..51dc647b19 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -522,7 +522,9 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep } break; case xmlrpc_datetime: - convert_to_string(&val); + if (!try_convert_to_string(&val)) { + return NULL; + } xReturn = XMLRPC_CreateValueDateTime_ISO8601(key, Z_STRVAL(val)); break; case xmlrpc_boolean: @@ -538,7 +540,9 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep xReturn = XMLRPC_CreateValueDouble(key, Z_DVAL(val)); break; case xmlrpc_string: - convert_to_string(&val); + if (!try_convert_to_string(&val)) { + return NULL; + } xReturn = XMLRPC_CreateValueString(key, Z_STRVAL(val), Z_STRLEN(val)); break; case xmlrpc_vector: @@ -925,7 +929,10 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) STRUCT_XMLRPC_ERROR err = {0}; /* return value should be a string */ - convert_to_string(&retval); + if (!try_convert_to_string(&retval)) { + zend_string_release_ex(php_function_name, 0); + break; + } xData = XMLRPC_IntrospectionCreateDescription(Z_STRVAL(retval), &err); |