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

[Jay Berkenbilt]

Author: qjb
Date: 2005-07-09 20:53:13 +0000 (Sat, 09 Jul 2005)
New Revision: 425

Added:
   packages/xerces/xerces26/trunk/debian/patches/
   packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch
Log:
try stack underflow patch from JIRA xercesc-1282 and 1421

Added: packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch
===================================================================
--- packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch	2005-07-09 20:44:33 UTC (rev 424)
+++ packages/xerces/xerces26/trunk/debian/patches/stack-underflow.patch	2005-07-09 20:53:13 UTC (rev 425)
@@ -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