[Python-checkins] r85821 - in python/branches/release31-maint: Misc/NEWS Modules/pyexpat.c

[georg.brandl]

Author: georg.brandl
Date: Sun Oct 24 16:20:36 2010
New Revision: 85821

Log:
Merged revisions 85536 via svnmerge from 
svn+ssh://svn.python.org/python/branches/py3k

........
  r85536 | georg.brandl | 2010-10-15 18:26:08 +0200 (Fr, 15 Okt 2010) | 1 line
  
  #9054: fix crash when using pyexpat with a system expat lib version 2.0.1.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/pyexpat.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Oct 24 16:20:36 2010
@@ -568,6 +568,9 @@
 Extension Modules
 -----------------
 
+- Issue #9054: Fix a crash occurring when using the pyexpat module
+  with expat version 2.0.1.
+
 - Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression
   introduced by issue #9324.
 
@@ -669,6 +672,7 @@
 
 Tests
 -----
+
 - Issue #9628: fix runtests.sh -x option so more than one test can be excluded.
 
 - Issue #9894: Do not hardcode ENOENT in test_subprocess.

Modified: python/branches/release31-maint/Modules/pyexpat.c
==============================================================================
--- python/branches/release31-maint/Modules/pyexpat.c	(original)
+++ python/branches/release31-maint/Modules/pyexpat.c	Sun Oct 24 16:20:36 2010
@@ -397,6 +397,9 @@
     PyObject *args;
     PyObject *temp;
 
+    if (!have_handler(self, CharacterData))
+        return -1;
+
     args = PyTuple_New(1);
     if (args == NULL)
         return -1;