mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix SXE->string cast for __toString in inheriting class

Browse Source 
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
This commit is contained in:
Nikita Popov 2014-05-03 10:49:10 +02:00
parent 65f488ece3
commit 42d4adabbd
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/zend.c
View File

@ -247,9 +247,6 @@ again:
{
TSRMLS_FETCH();
if (zend_std_cast_object_tostring(expr, expr_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
break;
}
if (Z_OBJ_HANDLER_P(expr, cast_object)) {
zval val;

3
Zend/zend_operators.c
View File

@ -921,9 +921,6 @@ try_again:
return STR_INIT("Array", sizeof("Array")-1, 0);
case IS_OBJECT: {
zval tmp;
//???if (zend_std_cast_object_tostring(op, &tmp, IS_STRING TSRMLS_CC) == SUCCESS) {
//??? return Z_STR(tmp);
//???}
if (Z_OBJ_HT_P(op)->cast_object) {
if (Z_OBJ_HT_P(op)->cast_object(op, &tmp, IS_STRING TSRMLS_CC) == SUCCESS) {
return Z_STR(tmp);

18
ext/simplexml/simplexml.c
View File

@ -1774,7 +1774,7 @@ static int cast_object(zval *object, int type, char *contents TSRMLS_DC)
/* {{{ sxe_object_cast()
*/
static int sxe_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
static int sxe_object_cast_ex(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
php_sxe_object *sxe;
xmlChar *contents = NULL;
@ -1826,13 +1826,25 @@ static int sxe_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
}
/* }}} */
/* Variant of sxe_object_cast_ex that handles overwritten __toString() method */
static int sxe_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
if (type == IS_STRING
&& zend_std_cast_object_tostring(readobj, writeobj, IS_STRING TSRMLS_CC) == SUCCESS
) {
return SUCCESS;
}
return sxe_object_cast_ex(readobj, writeobj, type TSRMLS_CC);
}
/* {{{ proto object SimpleXMLElement::__toString() U
Returns the string content */
SXE_METHOD(__toString)
{
zval result;
if (sxe_object_cast(getThis(), &result, IS_STRING TSRMLS_CC) == SUCCESS) {
if (sxe_object_cast_ex(getThis(), &result, IS_STRING TSRMLS_CC) == SUCCESS) {
RETURN_ZVAL(&result, 0, 0);
} else {
zval_ptr_dtor(&result);
@ -1909,7 +1921,7 @@ SXE_METHOD(count)
static zval *sxe_get_value(zval *z, zval *rv TSRMLS_DC) /* {{{ */
{
if (sxe_object_cast(z, rv, IS_STRING TSRMLS_CC) == FAILURE) {
if (sxe_object_cast_ex(z, rv, IS_STRING TSRMLS_CC) == FAILURE) {
zend_error(E_ERROR, "Unable to cast node to string");
/* FIXME: Should not be fatal */
}