From d014ea6b5efbfb3d143fc8aacf8bee733cf4c8f0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 26 Nov 1992 10:30:26 +0000 Subject: * classobject.c: in instance_lenth, test result of call_object for exception before using it. Fixed a few other places where the outcome of calling sq_length wasn't tested for exceptions (bltinmodule.c, ceval.c). --- Python/bltinmodule.c | 2 ++ Python/ceval.c | 2 ++ 2 files changed, 4 insertions(+) (limited to 'Python') diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index a6e02bed2d..85fd58ecee 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -412,6 +412,8 @@ min_max(v, sign) return NULL; } n = (*sq->sq_length)(v); + if (n < 0) + return NULL; if (n == 0) { err_setstr(ValueError, "min() or max() of empty sequence"); return NULL; diff --git a/Python/ceval.c b/Python/ceval.c index d3a732a62e..86ee6cfc23 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1881,6 +1881,8 @@ loop_subscript(v, w) } i = getintvalue(w); n = (*sq->sq_length)(v); + if (n < 0) + return NULL; /* Exception */ if (i >= n) return NULL; /* End of loop */ return (*sq->sq_item)(v, i); -- cgit v1.2.1