diff --git a/NEWS b/NEWS index d484e22668d..dee4a68c925 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,10 @@ PHP NEWS - SPL: . Added spl_object_id(). (Tyson Andre) +- XMLRPC: + . Fixed bug #74975 (Incorrect xmlrpc serialization for classes with declared + properties). (blar) + 03 Aug 2017, PHP 7.2.0beta2 - Core: diff --git a/ext/xmlrpc/tests/bug74975.phpt b/ext/xmlrpc/tests/bug74975.phpt new file mode 100644 index 00000000000..8f6a9dfb138 --- /dev/null +++ b/ext/xmlrpc/tests/bug74975.phpt @@ -0,0 +1,56 @@ +--TEST-- +Bug #74975 Different serialization for classes +--SKIPIF-- + +--FILE-- +xmlrpc_type = 'base64'; +$foo->scalar = 'foobar'; + +$bar = new Bar(); +$bar->xmlrpc_type = 'base64'; +$bar->scalar = 'foobar'; + +echo xmlrpc_encode([ + 'foo' => $foo, + 'bar' => $bar +]); + +?> +--EXPECTF-- + + + + + + + foo + + Zm9vYmFy + + + + bar + + Zm9vYmFy + + + + + + diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 4a6fbb0c120..2b1a642c05e 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1354,7 +1354,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */ zval* attr; type = xmlrpc_vector; - if ((attr = zend_hash_str_find(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR) - 1)) != NULL) { + if ((attr = zend_hash_str_find_ind(Z_OBJPROP_P(value), OBJECT_TYPE_ATTR, sizeof(OBJECT_TYPE_ATTR) - 1)) != NULL) { if (Z_TYPE_P(attr) == IS_STRING) { type = xmlrpc_str_as_type(Z_STRVAL_P(attr)); } @@ -1368,7 +1368,7 @@ XMLRPC_VALUE_TYPE get_zval_xmlrpc_type(zval* value, zval* newvalue) /* {{{ */ zval* val; if ((type == xmlrpc_base64 && Z_TYPE_P(value) == IS_OBJECT) || type == xmlrpc_datetime) { - if ((val = zend_hash_str_find(Z_OBJPROP_P(value), OBJECT_VALUE_ATTR, sizeof(OBJECT_VALUE_ATTR) - 1)) != NULL) { + if ((val = zend_hash_str_find_ind(Z_OBJPROP_P(value), OBJECT_VALUE_ATTR, sizeof(OBJECT_VALUE_ATTR) - 1)) != NULL) { ZVAL_COPY_VALUE(newvalue, val); } } else {