]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Sat, 20 Aug 2016 10:46:08 +0000 (12:46 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Sat, 20 Aug 2016 10:46:08 +0000 (12:46 +0200)
1  2 
ext/xml/xml.c

diff --cc ext/xml/xml.c
index de1019499818d1275e598c19c6bde5f5d0f884c7,5912f9143ddda69271ecbfb0e64b506e783c28bf..43086934a56b83017322d566fd04cd4ecb5a6edd
@@@ -1608,9 -1636,9 +1608,9 @@@ PHP_FUNCTION(xml_parser_set_option
                        break;
                case PHP_XML_OPTION_SKIP_TAGSTART:
                        convert_to_long_ex(val);
 -                      parser->toffset = Z_LVAL_PP(val);
 +                      parser->toffset = Z_LVAL_P(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;