mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
commit
c5e030f3aa
@ -610,7 +610,6 @@ PHP_METHOD(XMLReader, getParserProperty)
|
|||||||
{
|
{
|
||||||
zval *id;
|
zval *id;
|
||||||
zend_long property;
|
zend_long property;
|
||||||
int retval = -1;
|
|
||||||
xmlreader_object *intern;
|
xmlreader_object *intern;
|
||||||
|
|
||||||
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &property) == FAILURE) {
|
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &property) == FAILURE) {
|
||||||
@ -620,9 +619,12 @@ PHP_METHOD(XMLReader, getParserProperty)
|
|||||||
id = ZEND_THIS;
|
id = ZEND_THIS;
|
||||||
|
|
||||||
intern = Z_XMLREADER_P(id);
|
intern = Z_XMLREADER_P(id);
|
||||||
if (intern->ptr) {
|
if (!intern || !intern->ptr) {
|
||||||
retval = xmlTextReaderGetParserProp(intern->ptr,property);
|
zend_throw_error(NULL, "Cannot access parser properties before loading data");
|
||||||
|
RETURN_THROWS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int retval = xmlTextReaderGetParserProp(intern->ptr,property);
|
||||||
if (retval == -1) {
|
if (retval == -1) {
|
||||||
zend_argument_value_error(1, "must be a valid parser property");
|
zend_argument_value_error(1, "must be a valid parser property");
|
||||||
RETURN_THROWS();
|
RETURN_THROWS();
|
||||||
@ -961,7 +963,6 @@ PHP_METHOD(XMLReader, setParserProperty)
|
|||||||
{
|
{
|
||||||
zval *id;
|
zval *id;
|
||||||
zend_long property;
|
zend_long property;
|
||||||
int retval = -1;
|
|
||||||
bool value;
|
bool value;
|
||||||
xmlreader_object *intern;
|
xmlreader_object *intern;
|
||||||
|
|
||||||
@ -972,9 +973,12 @@ PHP_METHOD(XMLReader, setParserProperty)
|
|||||||
id = ZEND_THIS;
|
id = ZEND_THIS;
|
||||||
|
|
||||||
intern = Z_XMLREADER_P(id);
|
intern = Z_XMLREADER_P(id);
|
||||||
if (intern->ptr) {
|
if (!intern || !intern->ptr) {
|
||||||
retval = xmlTextReaderSetParserProp(intern->ptr,property, value);
|
zend_throw_error(NULL, "Cannot access parser properties before loading data");
|
||||||
|
RETURN_THROWS();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int retval = xmlTextReaderSetParserProp(intern->ptr,property, value);
|
||||||
if (retval == -1) {
|
if (retval == -1) {
|
||||||
zend_argument_value_error(1, "must be a valid parser property");
|
zend_argument_value_error(1, "must be a valid parser property");
|
||||||
RETURN_THROWS();
|
RETURN_THROWS();
|
||||||
|
19
ext/xmlreader/tests/bug81521.phpt
Normal file
19
ext/xmlreader/tests/bug81521.phpt
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--TEST--
|
||||||
|
Bug #81521: XMLReader::getParserProperty may throw with a valid property
|
||||||
|
--FILE--
|
||||||
|
<?php
|
||||||
|
$reader = new XMLReader();
|
||||||
|
try {
|
||||||
|
var_dump($reader->setParserProperty(XMLReader::LOADDTD, 1));
|
||||||
|
} catch (Error $e) {
|
||||||
|
echo $e->getMessage(), "\n";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
var_dump($reader->getParserProperty(XMLReader::LOADDTD));
|
||||||
|
} catch (Error $e) {
|
||||||
|
echo $e->getMessage(), "\n";
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
--EXPECT--
|
||||||
|
Cannot access parser properties before loading data
|
||||||
|
Cannot access parser properties before loading data
|
Loading…
Reference in New Issue
Block a user