[Python-checkins] r85536 - in python/branches/py3k: Misc/NEWS Modules/pyexpat.c

Fri Oct 15 18:26:08 CEST 2010

Author: georg.brandl
Date: Fri Oct 15 18:26:08 2010
New Revision: 85536
Log:
#9054: fix crash when using pyexpat with a system expat lib version 2.0.1.
Modified:
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Modules/pyexpat.c
Modified: python/branches/py3k/Misc/NEWS
==============================================================================

--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Oct 15 18:26:08 2010
@@ -66,6 +66,9 @@
 Extensions
 ----------
 
+- Issue #9054: Fix a crash occurring when using the pyexpat module
+ with expat version 2.0.1.
+
 - Issue #5355: Provide mappings from Expat error numbers to string
 descriptions and backwards, in order to actually make it possible
 to analyze error codes provided by ExpatError.
Modified: python/branches/py3k/Modules/pyexpat.c
==============================================================================
--- python/branches/py3k/Modules/pyexpat.c	(original)
+++ python/branches/py3k/Modules/pyexpat.c	Fri Oct 15 18:26:08 2010
@@ -351,6 +351,9 @@
 PyObject *args;
 PyObject *temp;
 
+ if (!have_handler(self, CharacterData))
+ return -1;
+
 args = PyTuple_New(1);
 if (args == NULL)
 return -1;
