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

[Jay Berkenbilt]

Author: qjb
Date: 2005-08-06 23:39:02 +0000 (Sat, 06 Aug 2005)
New Revision: 439

Added:
   packages/xerces/xerces26/trunk/debian/patches/00-stack-underflow.patch
   packages/xerces/xerces26/trunk/debian/patches/01-IGXMLScanner.patch
Removed:
   packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch
Modified:
   packages/xerces/xerces26/trunk/debian/changelog
Log:
restore accidentally lost patch

Modified: packages/xerces/xerces26/trunk/debian/changelog
===================================================================
--- packages/xerces/xerces26/trunk/debian/changelog	2005-08-06 23:10:20 UTC (rev 438)
+++ packages/xerces/xerces26/trunk/debian/changelog	2005-08-06 23:39:02 UTC (rev 439)
@@ -4,7 +4,7 @@
     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)
+    segmentation fault for certain input files (Xerces-C issue 1470)
   * Drop support for packages built with the native transcoder.  The
     xerces libraries now use the ICU transcoder exclusively.  As a result
     of repackaging of ICU, it is no longer necessary to install additional

Added: packages/xerces/xerces26/trunk/debian/patches/00-stack-underflow.patch
===================================================================
--- packages/xerces/xerces26/trunk/debian/patches/00-stack-underflow.patch	2005-08-06 23:10:20 UTC (rev 438)
+++ packages/xerces/xerces26/trunk/debian/patches/00-stack-underflow.patch	2005-08-06 23:39:02 UTC (rev 439)
@@ -0,0 +1,22 @@
+--- 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

Copied: packages/xerces/xerces26/trunk/debian/patches/01-IGXMLScanner.patch (from rev 437, packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch)

Deleted: packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch
===================================================================
--- packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch	2005-08-06 23:10:20 UTC (rev 438)
+++ packages/xerces/xerces26/trunk/debian/patches/IGXMLScanner.patch	2005-08-06 23:39:02 UTC (rev 439)
@@ -1,46 +0,0 @@
---- 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