c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

parser: Fix XML_PARSE_NOBLANKS dropping non-whitespace text

Browse Source 
Regressed with 1f5b5371.

Fixes #884.
This commit is contained in:
Nick Wellnhofer 2025-03-28 16:31:14 +01:00
parent a6398ab696
commit a5c4a6efe7
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
parser.c
View File

@ -4778,7 +4778,8 @@ static const unsigned char test_char_data[256] = {
}; };
static void static void
xmlCharacters(xmlParserCtxtPtr ctxt, const xmlChar *buf, int size) { xmlCharacters(xmlParserCtxtPtr ctxt, const xmlChar *buf, int size,
int isBlank) {
int checkBlanks; int checkBlanks;
if ((ctxt->sax == NULL) || (ctxt->disableSAX)) if ((ctxt->sax == NULL) || (ctxt->disableSAX))
@ -4793,7 +4794,7 @@ xmlCharacters(xmlParserCtxtPtr ctxt, const xmlChar *buf, int size) {
* essentially unusable. * essentially unusable.
*/ */
if ((checkBlanks) && if ((checkBlanks) &&
(areBlanks(ctxt, buf, size, 1))) { (areBlanks(ctxt, buf, size, isBlank))) {
if ((ctxt->sax->ignorableWhitespace != NULL) && if ((ctxt->sax->ignorableWhitespace != NULL) &&
(ctxt->keepBlanks)) (ctxt->keepBlanks))
ctxt->sax->ignorableWhitespace(ctxt->userData, buf, size); ctxt->sax->ignorableWhitespace(ctxt->userData, buf, size);
@ -4855,7 +4856,7 @@ get_more_space:
const xmlChar *tmp = ctxt->input->cur; const xmlChar *tmp = ctxt->input->cur;
ctxt->input->cur = in; ctxt->input->cur = in;
xmlCharacters(ctxt, tmp, nbchar); xmlCharacters(ctxt, tmp, nbchar, 1);
} }
return; return;
} }
@ -4891,7 +4892,7 @@ get_more:
const xmlChar *tmp = ctxt->input->cur; const xmlChar *tmp = ctxt->input->cur;
ctxt->input->cur = in; ctxt->input->cur = in;
xmlCharacters(ctxt, tmp, nbchar); xmlCharacters(ctxt, tmp, nbchar, 0);
line = ctxt->input->line; line = ctxt->input->line;
col = ctxt->input->col; col = ctxt->input->col;
@ -4958,7 +4959,7 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int partial) {
if (nbchar >= XML_PARSER_BIG_BUFFER_SIZE) { if (nbchar >= XML_PARSER_BIG_BUFFER_SIZE) {
buf[nbchar] = 0; buf[nbchar] = 0;
xmlCharacters(ctxt, buf, nbchar); xmlCharacters(ctxt, buf, nbchar, 0);
nbchar = 0; nbchar = 0;
SHRINK; SHRINK;
} }
@ -4967,7 +4968,7 @@ xmlParseCharDataComplex(xmlParserCtxtPtr ctxt, int partial) {
if (nbchar != 0) { if (nbchar != 0) {
buf[nbchar] = 0; buf[nbchar] = 0;
xmlCharacters(ctxt, buf, nbchar); xmlCharacters(ctxt, buf, nbchar, 0);
} }
/* /*
* cur == 0 can mean * cur == 0 can mean

34
testparser.c
View File

@ -255,6 +255,39 @@ testCtxtParseContent(void) {
return err; return err;
} }
static int
testNoBlanks(void) {
const xmlChar xml[] =
"<refentry>\n"
" <refsect1>\n"
" <para>\n"
" Run <command>tester --help</command> for more options.\n"
" </para>\n"
" </refsect1>\n"
"</refentry>\n";
const xmlChar expect[] =
"<?xml version=\"1.0\"?>\n"
"<refentry><refsect1><para>\n"
" Run <command>tester --help</command> for more options.\n"
" </para></refsect1></refentry>\n";
xmlDocPtr doc;
xmlChar *out;
int size;
int err = 0;
doc = xmlReadDoc(xml, NULL, NULL, XML_PARSE_NOBLANKS);
xmlDocDumpMemory(doc, &out, &size);
xmlFreeDoc(doc);
if (!xmlStrEqual(out, expect)) {
fprintf(stderr, "parsing with XML_PARSE_NOBLANKS failed\n");
err = 1;
}
xmlFree(out);
return err;
}
#endif /* LIBXML_OUTPUT_ENABLED */ #endif /* LIBXML_OUTPUT_ENABLED */
#ifdef LIBXML_SAX1_ENABLED #ifdef LIBXML_SAX1_ENABLED
@ -1123,6 +1156,7 @@ main(void) {
#endif #endif
#ifdef LIBXML_OUTPUT_ENABLED #ifdef LIBXML_OUTPUT_ENABLED
err |= testCtxtParseContent(); err |= testCtxtParseContent();
err |= testNoBlanks();
#endif #endif
#ifdef LIBXML_SAX1_ENABLED #ifdef LIBXML_SAX1_ENABLED
err |= testBalancedChunk(); err |= testBalancedChunk();