php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove failure paths for infallible code in simplexml

Browse Source 
For IS_STRING, sxe_object_cast_ex() will call cast_object() which cannot
fail for IS_STRING.
This commit is contained in:
Niels Dossche
2024-08-27 21:06:29 +02:00
parent 9979f4748c
commit 51d93c1947
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ext/simplexml/simplexml.c
View File

@@ -467,10 +467,9 @@ long_dim:
case IS_OBJECT:
if (Z_OBJCE_P(value) == ce_SimpleXMLElement) {
zval zval_copy;
if (sxe_object_cast_ex(Z_OBJ_P(value), &zval_copy, IS_STRING) == FAILURE) {
zend_throw_error(NULL, "Unable to cast node to string");
return &EG(error_zval);
}
zend_result rv = sxe_object_cast_ex(Z_OBJ_P(value), &zval_copy, IS_STRING);
ZEND_IGNORE_VALUE(rv);
ZEND_ASSERT(rv == SUCCESS);
value_str = Z_STR(zval_copy);
break;
@@ -1892,10 +1891,9 @@ PHP_METHOD(SimpleXMLElement, __toString)
RETURN_THROWS();
}
if (sxe_object_cast_ex(Z_OBJ_P(ZEND_THIS), return_value, IS_STRING) != SUCCESS) {
zval_ptr_dtor(return_value);
RETURN_EMPTY_STRING();
}
zend_result rv = sxe_object_cast_ex(Z_OBJ_P(ZEND_THIS), return_value, IS_STRING);
ZEND_IGNORE_VALUE(rv);
ZEND_ASSERT(rv == SUCCESS);
}
/* }}} */