From 97f5de01adf993aee17dcd26e22ae421d013f372 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Fri, 22 Mar 2019 01:30:32 -0600 Subject: bpo-35284: Fix the error handling in the compiler's compiler_call(). (GH-10625) compiler_call() needs to check if an error occurred during the maybe_optimize_method_call() call. --- Python/compile.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Python/compile.c b/Python/compile.c index 3656a7e..a992e4b 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -3879,6 +3879,7 @@ check_index(struct compiler *c, expr_ty e, slice_ty s) } } +// Return 1 if the method call was optimized, -1 if not, and 0 on error. static int maybe_optimize_method_call(struct compiler *c, expr_ty e) { @@ -3912,8 +3913,10 @@ maybe_optimize_method_call(struct compiler *c, expr_ty e) static int compiler_call(struct compiler *c, expr_ty e) { - if (maybe_optimize_method_call(c, e) > 0) - return 1; + int ret = maybe_optimize_method_call(c, e); + if (ret >= 0) { + return ret; + } if (!check_caller(c, e->v.Call.func)) { return 0; } -- cgit v0.12