From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 20 Aug 2016 10:42:03 +0000 (+0200)
Subject: Improvements to fix #72714, suggested by nikic
X-Git-Tag: php-5.6.26RC1~21^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52793c14d951b12f0eca806bb55a97011a322243;p=php

Improvements to fix #72714, suggested by nikic
---

diff --git a/ext/xml/tests/bug72714.phpt b/ext/xml/tests/bug72714.phpt
index 192c8f6949..7b44e1fd11 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 5d5c2e4c19..5912f9143d 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;