summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-24 14:20:36 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-24 14:20:36 (GMT)
commit5bbbf1d9f9c496a5947faf525291fab0c2ce50eb (patch)
treed3073f6c0b113e705233b9a2ace5a63e70ccc1b7 /Modules
parent983161186594c6fd7a0a97c76018dccd24e11a63 (diff)
downloadcpython-5bbbf1d9f9c496a5947faf525291fab0c2ce50eb.zip
cpython-5bbbf1d9f9c496a5947faf525291fab0c2ce50eb.tar.gz
cpython-5bbbf1d9f9c496a5947faf525291fab0c2ce50eb.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/pyexpat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 389975d..cc62274 100644
--- 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;