com php-src: Improvements to fix #72714, suggested by nikic: ext/xml/tests/bug72714.phpt ext/xml/xml.c

Commit: 52793c14d951b12f0eca806bb55a97011a322243 Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 20 Aug 2016 12:42:03 +0200 Parents: e4a006cd3e17338677ec269a8cdb1354f38e0cad Branches: PHP-5.6 PHP-7..0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=52793c14d951b12f0eca806bb55a97011a322243 Log: Improvements to fix #72714, suggested by nikic Bugs: https://bugs.php.net/72714 Changed paths: M ext/xml/tests/bug72714.phpt M ext/xml/xml.c Diff: diff --git a/ext/xml/tests/bug72714.phpt b/ext/xml/tests/bug72714.phpt index 192c8f6..7b44e1f 100644 --- a/ext/xml/tests/bug72714.phpt +++ b/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=== diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 5d5c2e4..5912f91 100644 --- a/ext/xml/xml.c +++ b/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;