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

swapped the attribute defaulting and attribute checking parts of parsing a

Browse Source 
* parser.c: swapped the attribute defaulting and attribute checking
  parts of parsing a new element start, fixes bug #127772
* result/valid/127772.* test/valid/127772.xml
  test/valid/dtds/127772.dtd: added the example in the regression tests
Daniel
This commit is contained in:
Daniel Veillard 2003-11-25 07:21:18 +00:00
parent 74c0e594e0
commit e70c877c83
6 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Nov 25 08:18:12 CET 2003 Daniel Veillard <daniel@veillard.com>
* parser.c: swapped the attribute defaulting and attribute checking
parts of parsing a new element start, fixes bug #127772
* result/valid/127772.* test/valid/127772.xml
test/valid/dtds/127772.dtd: added the example in the regression tests
Tue Nov 25 08:00:15 CET 2003 Daniel Veillard <daniel@veillard.com>
* parser.c: moved xmlCleanupThreads() to the end of xmlCleanupParser()

66
parser.c
View File

@ -7841,39 +7841,6 @@ failed:
if (ctxt->input->base != base) goto base_changed;
}
/*
* The attributes checkings
*/
for (i = 0; i < nbatts;i += 5) {
nsname = xmlGetNamespace(ctxt, atts[i + 1]);
if ((atts[i + 1] != NULL) && (nsname == NULL)) {
xmlNsErr(ctxt, XML_NS_ERR_UNDEFINED_NAMESPACE,
"Namespace prefix %s for %s on %s is not defined\n",
atts[i + 1], atts[i], localname);
}
atts[i + 2] = nsname;
/*
* [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same
* start-tag or empty-element tag.
* As extended by the Namespace in XML REC.
*/
for (j = 0; j < i;j += 5) {
if (atts[i] == atts[j]) {
if (atts[i+1] == atts[j+1]) {
xmlErrAttributeDup(ctxt, atts[i+1], atts[i]);
break;
}
if ((nsname != NULL) && (atts[j + 2] == nsname)) {
xmlNsErr(ctxt, XML_NS_ERR_ATTRIBUTE_REDEFINED,
"Namespaced Attribute %s in '%s' redefined\n",
atts[i], nsname, NULL);
break;
}
}
}
}
/*
* The attributes defaulting
*/
@ -7950,6 +7917,39 @@ failed:
}
}
/*
* The attributes checkings
*/
for (i = 0; i < nbatts;i += 5) {
nsname = xmlGetNamespace(ctxt, atts[i + 1]);
if ((atts[i + 1] != NULL) && (nsname == NULL)) {
xmlNsErr(ctxt, XML_NS_ERR_UNDEFINED_NAMESPACE,
"Namespace prefix %s for %s on %s is not defined\n",
atts[i + 1], atts[i], localname);
}
atts[i + 2] = nsname;
/*
* [ WFC: Unique Att Spec ]
* No attribute name may appear more than once in the same
* start-tag or empty-element tag.
* As extended by the Namespace in XML REC.
*/
for (j = 0; j < i;j += 5) {
if (atts[i] == atts[j]) {
if (atts[i+1] == atts[j+1]) {
xmlErrAttributeDup(ctxt, atts[i+1], atts[i]);
break;
}
if ((nsname != NULL) && (atts[j + 2] == nsname)) {
xmlNsErr(ctxt, XML_NS_ERR_ATTRIBUTE_REDEFINED,
"Namespaced Attribute %s in '%s' redefined\n",
atts[i], nsname, NULL);
break;
}
}
}
}
nsname = xmlGetNamespace(ctxt, prefix);
if ((prefix != NULL) && (nsname == NULL)) {
xmlNsErr(ctxt, XML_NS_ERR_UNDEFINED_NAMESPACE,

5
result/valid/127772.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0"?>
<!DOCTYPE a SYSTEM "dtds/127772.dtd">
<a>
<b xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://fakeurl.net">b text</b>
</a>

0
result/valid/127772.xml.err Normal file
View File

7
test/valid/127772.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE a SYSTEM "dtds/127772.dtd">
<a>
<b xlink:href="http://fakeurl.net">b text</b>
</a>

7
test/valid/dtds/127772.dtd Normal file
View File

@ -0,0 +1,7 @@
<!ELEMENT a (b*)>
<!ELEMENT b (#PCDATA)>
<!ATTLIST b xmlns:xlink CDATA #FIXED 'http://www.w3.org/1999/xlink'
xlink:type (simple) #FIXED 'simple'
xlink:href CDATA #IMPLIED>