Skip to content

Commit 823d058

Browse files
committed
Stop relying on lastError directly
Reading this directly will become deprecated in libxml2 2.14.
1 parent 6490a18 commit 823d058

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

ext/xml/compat.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,14 @@ XML_SetEndNamespaceDeclHandler(XML_Parser parser, XML_EndNamespaceDeclHandler en
564564
PHP_XML_API int
565565
XML_Parse(XML_Parser parser, const XML_Char *data, int data_len, int is_final)
566566
{
567-
int error;
567+
int error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
568568

569-
error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final);
570-
return !error && parser->parser->lastError.level <= XML_ERR_WARNING;
569+
if (!error) {
570+
const xmlError *error_data = xmlCtxtGetLastError(parser->parser);
571+
return !error_data || error_data->level <= XML_ERR_WARNING;
572+
}
573+
574+
return 0;
571575
}
572576

573577
PHP_XML_API int

0 commit comments

Comments
 (0)