From 8c434708efe3b9bb146d98db08fd980c66d413d7 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 11 Aug 2006 17:41:49 +0000 Subject: [PATCH] fix #38431 (xmlrpc_get_type() crashes PHP on objects) --- ext/xmlrpc/tests/bug38431.phpt | 25 +++++++++++++++++++++++++ ext/xmlrpc/xmlrpc-epi-php.c | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ext/xmlrpc/tests/bug38431.phpt diff --git a/ext/xmlrpc/tests/bug38431.phpt b/ext/xmlrpc/tests/bug38431.phpt new file mode 100644 index 0000000000..288fe1041d --- /dev/null +++ b/ext/xmlrpc/tests/bug38431.phpt @@ -0,0 +1,25 @@ +--TEST-- +Bug #38431 (xmlrpc_get_type() crashes PHP on objects) +--SKIPIF-- + +--FILE-- +1,2,3); +var_dump(xmlrpc_get_type($var)); +$var = array("test"=>1,"test2"=>2); +var_dump(xmlrpc_get_type($var)); + +echo "Done\n"; +?> +--EXPECTF-- +string(5) "array" +string(5) "array" +string(5) "array" +string(5) "mixed" +string(6) "struct" +Done diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 49abfc20bb..aa3867f29f 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1467,7 +1467,7 @@ PHP_FUNCTION(xmlrpc_get_type) type = get_zval_xmlrpc_type(*arg, 0); if (type == xmlrpc_vector) { - vtype = determine_vector_type(Z_ARRVAL_PP(arg)); + vtype = determine_vector_type((Z_TYPE_PP(arg) == IS_OBJECT) ? Z_OBJPROP_PP(arg) : Z_ARRVAL_PP(arg)); } RETURN_STRING((char*) xmlrpc_type_as_str(type, vtype), 1); -- 2.50.1