From 67c2733c8fff80692464b3420cce35a374d409e2 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 24 Oct 2010 14:16:05 +0000 Subject: Merged revisions 85536 via svnmerge from svn+ssh://pythondev@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. ........ --- Misc/NEWS | 3 +++ Modules/pyexpat.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 41d90d0..dcde292 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -345,6 +345,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. diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c index e05b3ad..0555b6d 100644 --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -415,6 +415,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; -- cgit v0.12