Merge lp:~zorba-coders/zorba/bug867156-importsegfaults into lp:zorba

[Cezar Andrei]

According to Xerces-C++ team( http://issues.apache.org/jira/browse/XERCESC-1980 ) XMLSchema.xsd i.e. schema4schema should be avoided to be imported. This fix avoids importing this schema file.

According to Xerces-C++ team( http://issues.apache.org/jira/browse/XERCESC-1980 ) XMLSchema.xsd i.e. schema4schema should be avoided to be imported. This fix avoids importing this schema file.

[Cezar Andrei (cezar-andrei)]

review: Approve

[Chris Hillery (ceejatec)]

Could you add a URL in the code comment pointing to a Xerces mailing list
discussion or other page where it is mentioned that you shouldn't import
schema for schema? I suspect that is something that will surprise anyone
who looks at the Zorba source code later, so it would be good to have
third-party confirmation.

Ceej
aka Chris Hillery
On Apr 23, 2012 1:48 PM, "Cezar Andrei" <email address hidden> wrote:

> The proposal to merge lp:~zorba-coders/zorba/bug867156-importsegfaults
> into lp:zorba has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
>
> https://code.launchpad.net/~zorba-coders/zorba/bug867156-importsegfaults/+merge/103169
> --
>
> https://code.launchpad.net/~zorba-coders/zorba/bug867156-importsegfaults/+merge/103169
> You are requested to review the proposed merge of
> lp:~zorba-coders/zorba/bug867156-importsegfaults into lp:zorba.
>

[Cezar Andrei (cezar-andrei)]

Done.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Cezar Andrei (cezar-andrei)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867156-importsegfaults-2012-04-23T21-34-13.402Z/log.html

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug867156-importsegfaults-2012-04-23T21-34-13.402Z is finished. The final status was:

All tests succeeded!

[Matthias Brantner (matthias-brantner)]

There are already plenty of definitions for the XMLSchema URI. I think it would make sense to reuse the one from src/zorbamisc/ns_consts.h.

review: Needs Fixing

[Cezar Andrei (cezar-andrei)]

This is addressed in proposal:
https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103367

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-04-23 10:46:38 +0000
+++ src/compiler/translator/translator.cpp	2012-04-23 21:19:20 +0000
@@ -105,7 +105,7 @@
 
 
 #define NODE_SORT_OPT
-
+#define XS_URI "http://www.w3.org/2001/XMLSchema"
 
 namespace zorba
 {
@@ -2011,6 +2011,14 @@
       theSctx->bind_ns(pfx, targetNS, loc, err::XQST0033);
   }
 
+  zstring xsdTNS = zstring(XS_URI);
+  if ( xsdTNS.compare(targetNS)==0 )
+  {
+    // Xerces doesn't like importing XMLSchema.xsd schema4schema, so we skip it
+    // see Xerces-C++ bug: https://issues.apache.org/jira/browse/XERCESC-1980
+    return no_state;
+  }
+
   store::Item_t targetNSItem = NULL;
   zstring tmp = targetNS;
   ITEM_FACTORY->createAnyURI(targetNSItem, tmp);