Browse Source

Improvements to fix #72714, suggested by nikic

pull/2091/head
Christoph M. Becker 9 years ago
parent
commit
52793c14d9
  1. 2
      ext/xml/tests/bug72714.phpt
  2. 4
      ext/xml/xml.c

2
ext/xml/tests/bug72714.phpt

@ -29,7 +29,7 @@ parse(20);
?>
===DONE===
--EXPECTF--
Notice: xml_parser_set_option(): tagstart ignored in %s%ebug72714.php on line %d
Notice: xml_parser_set_option(): tagstart ignored, because it is out of range in %s%ebug72714.php on line %d
string(9) "NS1:TOTAL"
string(0) ""
===DONE===

4
ext/xml/xml.c

@ -67,7 +67,7 @@ ZEND_GET_MODULE(xml)
/* }}} */
#define SKIP_TAGSTART(str) ((str) + (parser->toffset > strlen(str) ? strlen(str) : + parser->toffset))
#define SKIP_TAGSTART(str) ((str) + (parser->toffset > strlen(str) ? strlen(str) : parser->toffset))
/* {{{ function prototypes */
@ -1638,7 +1638,7 @@ PHP_FUNCTION(xml_parser_set_option)
convert_to_long_ex(val);
parser->toffset = Z_LVAL_PP(val);
if (parser->toffset < 0) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored");
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored, because it is out of range");
parser->toffset = 0;
}
break;

Loading…
Cancel
Save