Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* 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).
This commit is contained in:
Guido van Rossum 1992-11-26 10:30:26 +00:00
parent 18fc5696c8
commit d014ea6b5e
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/classobject.c
View File

@ -324,6 +324,8 @@ instance_length(inst)
return -1; return -1;
res = call_object(func, (object *)NULL); res = call_object(func, (object *)NULL);
DECREF(func); DECREF(func);
if (res == NULL)
return -1;
if (is_intobject(res)) { if (is_intobject(res)) {
outcome = getintvalue(res); outcome = getintvalue(res);
if (outcome < 0) if (outcome < 0)

2
Python/bltinmodule.c
View File

@ -412,6 +412,8 @@ min_max(v, sign)
return NULL; return NULL;
} }
n = (*sq->sq_length)(v); n = (*sq->sq_length)(v);
if (n < 0)
return NULL;
if (n == 0) { if (n == 0) {
err_setstr(ValueError, "min() or max() of empty sequence"); err_setstr(ValueError, "min() or max() of empty sequence");
return NULL; return NULL;

2
Python/ceval.c
View File

@ -1881,6 +1881,8 @@ loop_subscript(v, w)
} }
i = getintvalue(w); i = getintvalue(w);
n = (*sq->sq_length)(v); n = (*sq->sq_length)(v);
if (n < 0)
return NULL; /* Exception */
if (i >= n) if (i >= n)
return NULL; /* End of loop */ return NULL; /* End of loop */
return (*sq->sq_item)(v, i); return (*sq->sq_item)(v, i);