[Python-checkins] r74432 - in python/branches/release26-maint: Lib/test/test_pyexpat.py Misc/ACKS Misc/NEWS Modules/expat/xmltok_impl.c

[brett.cannon]

Author: brett.cannon
Date: Thu Aug 13 21:45:44 2009
New Revision: 74432

Log:
Backport of r74429. Not merged/blocked as svnmerge.py is giving me an error and
I don't want to accidentally check in busted svnmerge metadata.


Modified:
   python/branches/release26-maint/Lib/test/test_pyexpat.py
   python/branches/release26-maint/Misc/ACKS
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/expat/xmltok_impl.c

Modified: python/branches/release26-maint/Lib/test/test_pyexpat.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_pyexpat.py	(original)
+++ python/branches/release26-maint/Lib/test/test_pyexpat.py	Thu Aug 13 21:45:44 2009
@@ -559,6 +559,24 @@
         parser.Parse(xml2, 1)
         self.assertEquals(self.n, 4)
 
+class MalformedInputText(unittest.TestCase):
+    def test1(self):
+        xml = "\0\r\n"
+        parser = expat.ParserCreate()
+        try:
+            parser.Parse(xml, True)
+            self.fail()
+        except expat.ExpatError as e:
+            self.assertEquals(str(e), 'no element found: line 2, column 1')
+
+    def test2(self):
+        xml = "<?xml version\xc2\x85='1.0'?>\r\n"
+        parser = expat.ParserCreate()
+        try:
+            parser.Parse(xml, True)
+            self.fail()
+        except expat.ExpatError as e:
+            self.assertEquals(str(e), 'XML declaration not well-formed: line 1, column 14')
 
 def test_main():
     run_unittest(SetAttributeTest,
@@ -569,7 +587,8 @@
                  HandlerExceptionTest,
                  PositionTest,
                  sf1296433Test,
-                 ChardataBufferTest)
+                 ChardataBufferTest,
+                 MalformedInputText)
 
 if __name__ == "__main__":
     test_main()

Modified: python/branches/release26-maint/Misc/ACKS
==============================================================================
--- python/branches/release26-maint/Misc/ACKS	(original)
+++ python/branches/release26-maint/Misc/ACKS	Thu Aug 13 21:45:44 2009
@@ -177,6 +177,7 @@
 Dima Dorfman
 Cesar Douady
 Dean Draayer
+Fred L. Drake, Jr.
 John DuBois
 Paul Dubois
 Graham Dumpleton
@@ -358,7 +359,6 @@
 Lucas de Jonge
 John Jorgensen
 Jens B. Jorgensen
-Fred L. Drake, Jr.
 Andreas Jung
 Tattoo Mabonzo K.
 Bob Kahn
@@ -393,6 +393,7 @@
 Michael Kremer
 Fabian Kreutz
 Hannu Krosing
+Ivan Krstić
 Andrew Kuchling
 Vladimir Kushnir
 Cameron Laird

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Aug 13 21:45:44 2009
@@ -163,6 +163,8 @@
 Extension Modules
 -----------------
 
+- Fix expat to not segfault with specially crafted input.
+
 - Issue #4873: Fix resource leaks in error cases of pwd and grp.
 
 Build

Modified: python/branches/release26-maint/Modules/expat/xmltok_impl.c
==============================================================================
--- python/branches/release26-maint/Modules/expat/xmltok_impl.c	(original)
+++ python/branches/release26-maint/Modules/expat/xmltok_impl.c	Thu Aug 13 21:45:44 2009
@@ -1741,7 +1741,7 @@
                        const char *end,
                        POSITION *pos)
 {
-  while (ptr != end) {
+  while (ptr < end) {
     switch (BYTE_TYPE(enc, ptr)) {
 #define LEAD_CASE(n) \
     case BT_LEAD ## n: \