mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
A fix for SF bug #461546 (bug in long_mul).
Both int and long multiplication are changed to be more careful in their assumptions about when one of the arguments is a sequence: the assumption that at least one of the arguments must be an int (or long, respectively) is still held, but the assumption that these don't smell like sequences is no longer true: a subtype of int or long may well have a sequence-repeat thingie!
This commit is contained in:
parent
0891ac017d
commit
7e35d57c0c
3 changed files with 33 additions and 14 deletions
|
@ -344,14 +344,16 @@ int_mul(PyObject *v, PyObject *w)
|
|||
long a, b, ah, bh, x, y;
|
||||
int s = 1;
|
||||
|
||||
if (v->ob_type->tp_as_sequence &&
|
||||
v->ob_type->tp_as_sequence->sq_repeat) {
|
||||
if (!PyInt_Check(v) &&
|
||||
v->ob_type->tp_as_sequence &&
|
||||
v->ob_type->tp_as_sequence->sq_repeat) {
|
||||
/* sequence * int */
|
||||
a = PyInt_AsLong(w);
|
||||
return (*v->ob_type->tp_as_sequence->sq_repeat)(v, a);
|
||||
}
|
||||
else if (w->ob_type->tp_as_sequence &&
|
||||
w->ob_type->tp_as_sequence->sq_repeat) {
|
||||
if (!PyInt_Check(w) &&
|
||||
w->ob_type->tp_as_sequence &&
|
||||
w->ob_type->tp_as_sequence->sq_repeat) {
|
||||
/* int * sequence */
|
||||
a = PyInt_AsLong(v);
|
||||
return (*w->ob_type->tp_as_sequence->sq_repeat)(w, a);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue