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 Schema determinism check of ##other namespaces

Browse Source 
Non-compound (##local) and compound string atoms are always disjoint
regardless of whether the compound atom is negated (##other).

Closes #40.
This commit is contained in:
Nick Wellnhofer 2019-09-16 15:36:02 +02:00
parent 4e326a3aa9
commit e8c9cd5c7a
5 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
result/schemas/issue40_0_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/issue40_0.xml validates

0
result/schemas/issue40_0_0.err Normal file
View File

3
test/schemas/issue40_0.xml Normal file
View File

@ -0,0 +1,3 @@
<a:aaa xmlns:a="aaa_ns">
<x/>
</a:aaa>

10
test/schemas/issue40_0.xsd Normal file
View File

@ -0,0 +1,10 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="aaa_ns" xmlns="http://www.w3.org/1999/XSL/Transform">
<xsd:element name="aaa">
<xsd:complexType>
<xsd:choice>
<xsd:any namespace="##other" processContents="skip" />
<xsd:any namespace="##local" processContents="skip" />
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>

15
xmlregexp.c
View File

@ -2528,9 +2528,18 @@ xmlFACompareAtoms(xmlRegAtomPtr atom1, xmlRegAtomPtr atom2, int deep) {
case XML_REGEXP_STRING:
if (!deep)
ret = (atom1->valuep != atom2->valuep);
else
ret = xmlRegStrEqualWildcard((xmlChar *)atom1->valuep,
(xmlChar *)atom2->valuep);
else {
xmlChar *val1 = (xmlChar *)atom1->valuep;
xmlChar *val2 = (xmlChar *)atom2->valuep;
int compound1 = (xmlStrchr(val1, '|') != NULL);
int compound2 = (xmlStrchr(val2, '|') != NULL);
/* Ignore negative match flag for ##other namespaces */
if (compound1 != compound2)
return(0);
ret = xmlRegStrEqualWildcard(val1, val2);
}
break;
case XML_REGEXP_EPSILON:
goto not_determinist;