From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 10 Nov 2001 13:57:55 +0000 (+0000)
Subject: Merge 1.42 from PyXML: Flag errors resulting from argument conversion problems.
X-Git-Tag: v2.2.1c1~794
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d7c55faeedd020a7be52d8997e9d330389ed4c0;p=python

Merge 1.42 from PyXML: Flag errors resulting from argument conversion problems.
Fixes problem with not detecting UTF-8 errors.
---

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index db4333c7c6..96cb79d744 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); \