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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index c505aee03253abc2b14690c1cb4855a36bfc73ba..ed84a5eae4b5143aa7c1ded060f8da741b27342f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -568,6 +568,9 @@ Library
 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 @@ Build
 
 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.

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 389975d52bdbc9a272464c63147b8a9bec13cf2e..cc62274d1484c3489f6bb58e5a828e389f8aec39 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -397,6 +397,9 @@ call_character_handler(xmlparseobject *self, const XML_Char *buffer, int len)
     PyObject *args;
     PyObject *temp;
 
+    if (!have_handler(self, CharacterData))
+        return -1;
+
     args = PyTuple_New(1);
     if (args == NULL)
         return -1;