mirror of
https://github.com/GNOME/libxml2.git
synced 2025-03-31 19:10:28 +08:00
forgot to apply one check from #106931 patch more work on XML Schemas
* xinclude.c: forgot to apply one check from #106931 patch * xmlschemastypes.c: more work on XML Schemas datatypes Daniel
This commit is contained in:
parent
c4c215519f
commit
b6c7f415b7
@ -1,3 +1,8 @@
|
||||
Sat Mar 29 17:35:05 CET 2003 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* xinclude.c: forgot to apply one check from #106931 patch
|
||||
* xmlschemastypes.c: more work on XML Schemas datatypes
|
||||
|
||||
Sat Mar 29 11:49:25 CET 2003 Daniel Veillard <daniel@veillard.com>
|
||||
|
||||
* relaxng.c include/libxml/relaxng.h xmlschemastypes.c: more work
|
||||
|
@ -1064,7 +1064,8 @@ xmlXIncludeMergeEntity(xmlEntityPtr ent, xmlXIncludeMergeDataPtr data,
|
||||
if ((ent->SystemID != NULL) && (prev->SystemID != NULL)) {
|
||||
if (!xmlStrEqual(ent->SystemID, prev->SystemID))
|
||||
goto error;
|
||||
} else if ((ent->SystemID != NULL) && (prev->SystemID != NULL)) {
|
||||
} else if ((ent->ExternalID != NULL) &&
|
||||
(prev->ExternalID != NULL)) {
|
||||
if (!xmlStrEqual(ent->ExternalID, prev->ExternalID))
|
||||
goto error;
|
||||
} else if ((ent->content != NULL) && (prev->content != NULL)) {
|
||||
|
1394
xmlschemastypes.c
1394
xmlschemastypes.c
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user