summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2001-11-10 13:57:55 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2001-11-10 13:57:55 (GMT)
commit1d7c55faeedd020a7be52d8997e9d330389ed4c0 (patch)
treea9c5da40d24e192d431591fb1f370e15afdcca33 /Modules
parent439eaa9f749ab7168e99fce5c867434d28951946 (diff)
downloadcpython-1d7c55faeedd020a7be52d8997e9d330389ed4c0.zip
cpython-1d7c55faeedd020a7be52d8997e9d330389ed4c0.tar.gz
cpython-1d7c55faeedd020a7be52d8997e9d330389ed4c0.tar.bz2
Merge 1.42 from PyXML: Flag errors resulting from argument conversion problems.
Fixes problem with not detecting UTF-8 errors.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/pyexpat.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index db4333c..96cb79d 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -475,8 +475,7 @@ my_##NAME##Handler PARAMS {\
if (self->handlers[NAME] \
&& self->handlers[NAME] != Py_None) { \
args = Py_BuildValue PARAM_FORMAT ;\
- if (!args) \
- return RETURN; \
+ if (!args) { flag_error(self); return RETURN;} \
self->in_callback = 1; \
rv = call_with_frame(getcode(NAME,#NAME,__LINE__), \
self->handlers[NAME], args); \