* classobject.c: in instance_lenth, test result of call_object

gvanrossum · gvanrossum · commit d014ea6b5efb · 1992-11-26T10:30:26.000Z
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).
diff --git a/Objects/classobject.c b/Objects/classobject.c
@@ -324,6 +324,8 @@ instance_length(inst)
 		return -1;
 	res = call_object(func, (object *)NULL);
 	DECREF(func);
+	if (res == NULL)
+		return -1;
 	if (is_intobject(res)) {
 		outcome = getintvalue(res);
 		if (outcome < 0)
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,8 @@ min_max(v, sign)`
`412`	`412`	`return NULL;`
`413`	`413`	`}`
`414`	`414`	`n = (*sq->sq_length)(v);`
	`415`	`+ if (n < 0)`
	`416`	`+ return NULL;`
`415`	`417`	`if (n == 0) {`
`416`	`418`	`err_setstr(ValueError, "min() or max() of empty sequence");`
`417`	`419`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -1881,6 +1881,8 @@ loop_subscript(v, w)`
`1881`	`1881`	`}`
`1882`	`1882`	`i = getintvalue(w);`
`1883`	`1883`	`n = (*sq->sq_length)(v);`
	`1884`	`+ if (n < 0)`
	`1885`	`+ return NULL; /* Exception */`
`1884`	`1886`	`if (i >= n)`
`1885`	`1887`	`return NULL; /* End of loop */`
`1886`	`1888`	`return (*sq->sq_item)(v, i);`