lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00
Code Activity

Fixes bug #106931 in XInclude entities merging. Daniel

Browse Source 
* xinclude.c: Fixes bug #106931 in XInclude entities merging.
Daniel
This commit is contained in:
Daniel Veillard
2003-02-24 18:16:47 +00:00
parent fcc822e2db
commit 2406abda9c
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Feb 24 19:14:57 CET 2003 Daniel Veillard <daniel@veillard.com>
* xinclude.c: Fixes bug #106931 in XInclude entities merging.
Mon Feb 24 18:50:35 CET 2003 Daniel Veillard <daniel@veillard.com> Mon Feb 24 18:50:35 CET 2003 Daniel Veillard <daniel@veillard.com>
* SAX.c: fixed bug #105992 * SAX.c: fixed bug #105992

3
xinclude.c
View File

@ -1062,6 +1062,9 @@ xmlXIncludeMergeEntity(xmlEntityPtr ent, xmlXIncludeMergeDataPtr data,
} else if ((ent->SystemID != NULL) && (prev->SystemID != NULL)) { } else if ((ent->SystemID != NULL) && (prev->SystemID != NULL)) {
if (!xmlStrEqual(ent->ExternalID, prev->ExternalID)) if (!xmlStrEqual(ent->ExternalID, prev->ExternalID))
goto error; goto error;
} else if ((ent->content != NULL) && (prev->content != NULL)) {
if (!xmlStrEqual(ent->content, prev->content))
goto error;
} else { } else {
goto error; goto error;
} }