You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2001/11/28 17:46:20 UTC
cvs commit: xml-xerces/c/src/validators/common MixedContentModel.hpp SimpleContentModel.cpp
tng 01/11/28 08:46:20
Modified: c/src/validators/common MixedContentModel.hpp
SimpleContentModel.cpp
Log:
Schema fix: Check for invalid URI index first.
Revision Changes Path
1.12 +5 -1 xml-xerces/c/src/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/MixedContentModel.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MixedContentModel.hpp 2001/11/21 14:30:13 1.11
+++ MixedContentModel.hpp 2001/11/28 16:46:20 1.12
@@ -56,6 +56,9 @@
/*
* $Log: MixedContentModel.hpp,v $
+ * Revision 1.12 2001/11/28 16:46:20 tng
+ * Schema fix: Check for invalid URI index first.
+ *
* Revision 1.11 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
*
@@ -254,7 +257,8 @@
unsigned int i = 0;
for (i = 0; i < fCount; i++) {
unsigned int orgURIIndex = fChildren[i]->getURI();
- fChildren[i]->setURI(pContentSpecOrgURI[orgURIIndex]);
+ if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ fChildren[i]->setURI(pContentSpecOrgURI[orgURIIndex]);
}
// for mixed content model, it's only a sequence
1.11 +7 -2 xml-xerces/c/src/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SimpleContentModel.cpp 2001/11/21 14:30:13 1.10
+++ SimpleContentModel.cpp 2001/11/28 16:46:20 1.11
@@ -56,6 +56,9 @@
/*
* $Log: SimpleContentModel.cpp,v $
+ * Revision 1.11 2001/11/28 16:46:20 tng
+ * Schema fix: Check for invalid URI index first.
+ *
* Revision 1.10 2001/11/21 14:30:13 knoaman
* Fix for UPA checking.
*
@@ -493,10 +496,12 @@
unsigned int orgURIIndex = 0;
orgURIIndex = fFirstChild->getURI();
- fFirstChild->setURI(pContentSpecOrgURI[orgURIIndex]);
+ if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ fFirstChild->setURI(pContentSpecOrgURI[orgURIIndex]);
orgURIIndex = fSecondChild->getURI();
- fSecondChild->setURI(pContentSpecOrgURI[orgURIIndex]);
+ if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ fSecondChild->setURI(pContentSpecOrgURI[orgURIIndex]);
// only possible violation is when it's a choice
if (fOp == ContentSpecNode::Choice) {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org