Author: amassari
Date: Fri Mar 14 04:33:27 2008
New Revision: 637064
URL: http://svn.apache.org/viewvc?rev=637064&view=rev
Log:
If the XPath parser returns 'false', it means the XPath is invalid...
(XERCESC-1787)
Added:
xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/
xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/schema.xsd
Modified:
xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet
Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp?rev=637064&r1=637063&r2=637064&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/schema/identity/XercesXPath.cpp Fri
Mar 14 04:33:27 2008
@@ -390,7 +390,9 @@
ValueVectorOf<int> tokens(16, fMemoryManager);
XPathScannerForSchema scanner(stringPool);
- scanner.scanExpression(fExpression, 0, length, &tokens);
+ if(!scanner.scanExpression(fExpression, 0, length, &tokens))
+ ThrowXMLwithMemMgr(XPathException,
XMLExcepts::XPath_TokenNotSupported, fMemoryManager);
+
bool firstTokenOfLocationPath=true;
unsigned int tokenCount = tokens.size();
RefVectorOf<XercesStep>* stepsVector = new (fMemoryManager)
RefVectorOf<XercesStep>(16, true, fMemoryManager);
Added: xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/schema.xsd
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/schema.xsd?rev=637064&view=auto
==============================================================================
--- xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/schema.xsd
(added)
+++ xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1787/schema.xsd Fri
Mar 14 04:33:27 2008
@@ -0,0 +1,20 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
+
+<xs:element name="Songs">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Song" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="title" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:unique name="Song">
+ <xs:selector xpath="*:Song"/>
+ <xs:field xpath="@title"/>
+ </xs:unique>
+</xs:element>
+
+</xs:schema>
\ No newline at end of file
Modified: xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet?rev=637064&r1=637063&r2=637064&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet (original)
+++ xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet Fri Mar 14
04:33:27 2008
@@ -419,4 +419,15 @@
<current status="accepted" date="2008-02-13"/>
</schemaTest>
</testGroup>
+ <testGroup name="XERCESC-1787">
+ <annotation>
+ <documentation>Wildcard namespace prefixes in XPath are
not reported as errors</documentation>
+ </annotation>
+ <documentationReference
xlink:href="https://issues.apache.org/jira/browse/XERCESC-1787"/>
+ <schemaTest name="XERCESC-1787">
+ <schemaDocument xlink:href="./XERCESC-1787/schema.xsd"/>
+ <expected validity="invalid"/>
+ <current status="accepted" date="2008-03-14"/>
+ </schemaTest>
+ </testGroup>
</testSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
