[xml/sgml-commit] r437 - in packages/xerces/xerces26/trunk/debian: . patches

[Jay Berkenbilt]

Author: qjb
Date: 2005-08-06 20:01:32 +0000 (Sat, 06 Aug 2005)
New Revision: 437

Added:
   packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch
Removed:
   packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch
Modified:
   packages/xerces/xerces26/trunk/debian/changelog
Log:
updated patch

Modified: packages/xerces/xerces26/trunk/debian/changelog
===================================================================
--- packages/xerces/xerces26/trunk/debian/changelog	2005-08-06 19:42:00 UTC (rev 436)
+++ packages/xerces/xerces26/trunk/debian/changelog	2005-08-06 20:01:32 UTC (rev 437)
@@ -1,8 +1,10 @@
-xerces26 (2.6.0-5) UNRELEASED; urgency=low
+xerces26 (2.6.0-5) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * XXX mention change of 1252 to 1282 below?
-  * New ICU
+  * Previous changelog entry mentioned issue 1252 by mistake instead of
+    1282; corrected changelog to avoid confusion.
+  * Rebuild for new ICU
+  * Patch to correct a problem in IGXMLScanner.cpp that could cause a
+    segmentation fault for certain input files (Xerces-C issue 1471)
 
  -- Jay Berkenbilt <qjb at debian.org>  Sat,  6 Aug 2005 15:40:25 -0400
 

Added: packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch
===================================================================
--- packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch	2005-08-06 19:42:00 UTC (rev 436)
+++ packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch	2005-08-06 20:01:32 UTC (rev 437)
@@ -0,0 +1,46 @@
+--- src/xercesc/internal/IGXMLScanner.cpp.qdist	2005-08-04 11:57:04.000000000 -0400
++++ src/xercesc/internal/IGXMLScanner.cpp	2005-08-04 11:59:20.000000000 -0400
+@@ -2324,12 +2324,16 @@
+                            , Grammar::TOP_LEVEL_SCOPE
+                        );
+ 
+-            if(!elemDecl) 
+-            {
+-                // look in the list of undeclared elements, as would have been done
+-                // before we made grammars stateless:
+-                elemDecl = fSchemaElemNonDeclPool->getByKey(nameRawBuf, uriId, Grammar::TOP_LEVEL_SCOPE);
+-            }
++            if(!elemDecl)
++	    {
++		    // switch back to original grammar first if necessary
++		    if (orgGrammarUri != uriId) {
++			switchGrammar(original_uriStr);
++		    }
++		// look in the list of undeclared elements, as would have been done
++		// before we made grammars stateless:
++		elemDecl = fSchemaElemNonDeclPool->getByKey(nameRawBuf, uriId, Grammar::TOP_LEVEL_SCOPE);
++	    }
+             if(!elemDecl) {
+                 // still not found in specified uri
+                 // try emptyNamesapce see if element should be un-qualified.
+@@ -2455,11 +2459,15 @@
+                            , Grammar::TOP_LEVEL_SCOPE
+                        );
+             if(!elemDecl)
+-            {
+-                // look in the list of undeclared elements, as would have been done
+-                // before we made grammars stateless:
+-                elemDecl = fSchemaElemNonDeclPool->getByKey(nameRawBuf, uriId, Grammar::TOP_LEVEL_SCOPE);
+-            }
++	    {
++		    // switch back to original grammar first if necessary
++		    if (orgGrammarUri != uriId) {
++			switchGrammar(original_uriStr);
++		    }
++		// look in the list of undeclared elements, as would have been done
++		// before we made grammars stateless:
++		elemDecl = fSchemaElemNonDeclPool->getByKey(nameRawBuf, uriId, Grammar::TOP_LEVEL_SCOPE);
++	    }
+ 
+             if (!elemDecl && orgGrammarUri != fEmptyNamespaceId) {
+                 // still Not found in specified uri

Deleted: packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch
===================================================================
--- packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch	2005-08-06 19:42:00 UTC (rev 436)
+++ packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch	2005-08-06 20:01:32 UTC (rev 437)
@@ -1,22 +0,0 @@
---- src/xercesc/internal/IGXMLScanner.cpp.qdist	2004-09-21 12:10:47.000000000 -0400
-+++ src/xercesc/internal/IGXMLScanner.cpp	2005-07-09 16:50:17.821006037 -0400
-@@ -1170,7 +1170,7 @@
-         if (!isRoot)
-         {
-             // update error information
--            fErrorStack->push(fErrorStack->pop() || fPSVIElemContext.fErrorOccurred);
-+	    fErrorStack->push((fErrorStack->size() && fErrorStack->pop()) || fPSVIElemContext.fErrorOccurred);
-         }
-     }
- 
---- src/xercesc/internal/SGXMLScanner.cpp.qdist	2004-09-29 15:23:32.000000000 -0400
-+++ src/xercesc/internal/SGXMLScanner.cpp	2005-07-09 16:50:38.139881764 -0400
-@@ -1025,7 +1025,7 @@
-     if (!isRoot)
-     {
-         // update error information
--        fErrorStack->push(fErrorStack->pop() || fPSVIElemContext.fErrorOccurred);
-+        fErrorStack->push((fErrorStack->size() && fErrorStack->pop()) || fPSVIElemContext.fErrorOccurred);
-     }
- 
-     // If this was the root, then done with content