lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Code Activity

parser: Fix progress check when parsing character data

Browse Source 
Skip over zero bytes to guarantee progress. Short-lived regression.
This commit is contained in:
Nick Wellnhofer
2022-11-21 21:35:01 +01:00
parent 234915361e
commit a8b31e68c2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parser.c
View File

@@ -4666,7 +4666,7 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt) {
} }
} }
} }
if ((CUR != 0) && (!IS_CHAR(cur))) { if ((ctxt->input->cur < ctxt->input->end) && (!IS_CHAR(cur))) {
/* Generate the error and skip the offending character */ /* Generate the error and skip the offending character */
xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR, xmlFatalErrMsgInt(ctxt, XML_ERR_INVALID_CHAR,
"PCDATA invalid Char value %d\n", "PCDATA invalid Char value %d\n",

2
parserInternals.c
View File

@@ -400,7 +400,7 @@ xmlNextChar(xmlParserCtxtPtr ctxt)
return; return;
} }
if ((*ctxt->input->cur == 0) && if ((ctxt->input->cur >= ctxt->input->end) &&
(xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0)) { (xmlParserInputGrow(ctxt->input, INPUT_CHUNK) <= 0)) {
return; return;
} }