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

Fix regression with PEs in external DTD

Browse Source 
Fix a regression introduced with commit a28f7d87. In some cases,
parameter entity references in external DTDs wouldn't be expanded.

Fixes #306.
This commit is contained in:
Nick Wellnhofer 2022-01-16 21:39:04 +01:00
parent 9f4cb84c62
commit d85245f934
6 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parser.c
View File

@ -2194,7 +2194,8 @@ xmlSkipBlankChars(xmlParserCtxtPtr ctxt) {
* It's Okay to use CUR/NEXT here since all the blanks are on
* the ASCII range.
*/
if (ctxt->instate != XML_PARSER_DTD) {
if (((ctxt->inputNr == 1) && (ctxt->instate != XML_PARSER_DTD)) ||
(ctxt->instate == XML_PARSER_START)) {
const xmlChar *cur;
/*
* if we are in the document content, go really fast

3
result/valid/pe-test.xml Normal file
View File

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE doc SYSTEM "dtds/pe-test.dtd">
<doc>&ent;</doc>

0
result/valid/pe-test.xml.err Normal file
View File

0
result/valid/pe-test.xml.err.rdr Normal file
View File

3
test/valid/dtds/pe-test.dtd Normal file
View File

@ -0,0 +1,3 @@
<!ELEMENT doc (#PCDATA)>
<!ENTITY % decl 'ent "value"'>
<!ENTITY %decl;>

2
test/valid/pe-test.xml Normal file
View File

@ -0,0 +1,2 @@
<!DOCTYPE doc SYSTEM "dtds/pe-test.dtd">
<doc>&ent;</doc>