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 2002/02/25 22:18:53 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/common DFAContentModel.cpp MixedContentModel.hpp SimpleContentModel.cpp
tng 02/02/25 13:18:53
Modified: c/src/xercesc/validators/common DFAContentModel.cpp
MixedContentModel.hpp SimpleContentModel.cpp
Log:
Schema Fix: Ensure no invalid uri index for UPA checking.
Revision Changes Path
1.2 +7 -1 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DFAContentModel.cpp 1 Feb 2002 22:22:38 -0000 1.1
+++ DFAContentModel.cpp 25 Feb 2002 21:18:53 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: DFAContentModel.cpp,v $
- * Revision 1.1 2002/02/01 22:22:38 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/25 21:18:53 tng
+ * Schema Fix: Ensure no invalid uri index for UPA checking.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:38 peiyongz
+ * sane_include
*
* Revision 1.29 2001/12/10 21:42:55 peiyongz
* Memory Leak: fLeafNameTypeVector
@@ -1192,7 +1195,10 @@
unsigned int orgURIIndex = fElemMap[i]->getURI();
- if (orgURIIndex != XMLContentModel::gEOCFakeId) {
+ if ((orgURIIndex != XMLContentModel::gEOCFakeId) &&
+ (orgURIIndex != XMLContentModel::gEpsilonFakeId) &&
+ (orgURIIndex != XMLElementDecl::fgInvalidElemId) &&
+ (orgURIIndex != XMLElementDecl::fgPCDataElemId)) {
fElemMap[i]->setURI(pContentSpecOrgURI[orgURIIndex]);
}
}
1.2 +6 -1 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MixedContentModel.hpp 1 Feb 2002 22:22:39 -0000 1.1
+++ MixedContentModel.hpp 25 Feb 2002 21:18:53 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: MixedContentModel.hpp,v $
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/25 21:18:53 tng
+ * Schema Fix: Ensure no invalid uri index for UPA checking.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.12 2001/11/28 16:46:20 tng
* Schema fix: Check for invalid URI index first.
@@ -260,7 +263,9 @@
unsigned int i = 0;
for (i = 0; i < fCount; i++) {
unsigned int orgURIIndex = fChildren[i]->getURI();
- if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ if ((orgURIIndex != XMLContentModel::gEOCFakeId) &&
+ (orgURIIndex != XMLElementDecl::fgInvalidElemId) &&
+ (orgURIIndex != XMLElementDecl::fgPCDataElemId))
fChildren[i]->setURI(pContentSpecOrgURI[orgURIIndex]);
}
1.2 +9 -2 xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleContentModel.cpp 1 Feb 2002 22:22:39 -0000 1.1
+++ SimpleContentModel.cpp 25 Feb 2002 21:18:53 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: SimpleContentModel.cpp,v $
- * Revision 1.1 2002/02/01 22:22:39 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/25 21:18:53 tng
+ * Schema Fix: Ensure no invalid uri index for UPA checking.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:39 peiyongz
+ * sane_include
*
* Revision 1.11 2001/11/28 16:46:20 tng
* Schema fix: Check for invalid URI index first.
@@ -499,11 +502,15 @@
unsigned int orgURIIndex = 0;
orgURIIndex = fFirstChild->getURI();
- if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ if ((orgURIIndex != XMLContentModel::gEOCFakeId) &&
+ (orgURIIndex != XMLElementDecl::fgInvalidElemId) &&
+ (orgURIIndex != XMLElementDecl::fgPCDataElemId))
fFirstChild->setURI(pContentSpecOrgURI[orgURIIndex]);
orgURIIndex = fSecondChild->getURI();
- if (orgURIIndex != XMLContentModel::gEOCFakeId)
+ if ((orgURIIndex != XMLContentModel::gEOCFakeId) &&
+ (orgURIIndex != XMLElementDecl::fgInvalidElemId) &&
+ (orgURIIndex != XMLElementDecl::fgPCDataElemId))
fSecondChild->setURI(pContentSpecOrgURI[orgURIIndex]);
// only possible violation is when it's a choice
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org