archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

news entry for #1787

Browse source
This commit is contained in:
Joe Watkins 2016-11-13 05:37:49 +00:00
commit f77be645bc
5 changed files with 98 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/xml/compat.c
View file

@ -593,12 +593,19 @@ has been defined and none can be detected */
}
#endif
if (parser->parser->lastError.level >= XML_ERR_WARNING) {
return 0;
}
error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
if (error) {
<<<<<<< HEAD
return 0;
} else {
return 1;
} else if (parser->parser->lastError.level > XML_ERR_WARNING ){
=======
>>>>>>> PHP-7.1
return 0;
} else {
return 1;