Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #8259: Get rid of 'outrageous left shift count' error when 

left-shifting an integer by more than 2**31 on a 64-bit machine.  Also
convert shift counts to a Py_ssize_t instead of a C long.
This commit is contained in:
Mark Dickinson 2010-04-06 16:46:09 +00:00
parent 72ec2e2bdf
commit 3ec9b942b5
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Objects/longobject.c
View File

@ -3614,8 +3614,7 @@ long_rshift(PyLongObject *v, PyLongObject *w)
{ {
PyLongObject *a, *b; PyLongObject *a, *b;
PyLongObject *z = NULL; PyLongObject *z = NULL;
long shiftby; Py_ssize_t shiftby, newsize, wordshift, loshift, hishift, i, j;
Py_ssize_t newsize, wordshift, loshift, hishift, i, j;
digit lomask, himask; digit lomask, himask;
CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b); CONVERT_BINOP((PyObject *)v, (PyObject *)w, &a, &b);
@ -3634,8 +3633,7 @@ long_rshift(PyLongObject *v, PyLongObject *w)
Py_DECREF(a2); Py_DECREF(a2);
} }
else { else {
shiftby = PyLong_AsSsize_t((PyObject *)b);
shiftby = PyLong_AsLong((PyObject *)b);
if (shiftby == -1L && PyErr_Occurred()) if (shiftby == -1L && PyErr_Occurred())
goto rshift_error; goto rshift_error;
if (shiftby < 0) { if (shiftby < 0) {
@ -3681,27 +3679,21 @@ long_lshift(PyObject *v, PyObject *w)
/* This version due to Tim Peters */ /* This version due to Tim Peters */
PyLongObject *a, *b; PyLongObject *a, *b;
PyLongObject *z = NULL; PyLongObject *z = NULL;
long shiftby; Py_ssize_t shiftby, oldsize, newsize, wordshift, remshift, i, j;
Py_ssize_t oldsize, newsize, wordshift, remshift, i, j;
twodigits accum; twodigits accum;
CONVERT_BINOP(v, w, &a, &b); CONVERT_BINOP(v, w, &a, &b);
shiftby = PyLong_AsLong((PyObject *)b); shiftby = PyLong_AsSsize_t((PyObject *)b);
if (shiftby == -1L && PyErr_Occurred()) if (shiftby == -1L && PyErr_Occurred())
goto lshift_error; goto lshift_error;
if (shiftby < 0) { if (shiftby < 0) {
PyErr_SetString(PyExc_ValueError, "negative shift count"); PyErr_SetString(PyExc_ValueError, "negative shift count");
goto lshift_error; goto lshift_error;
} }
if ((long)(int)shiftby != shiftby) {
PyErr_SetString(PyExc_ValueError,
"outrageous left shift count");
goto lshift_error;
}
/* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */ /* wordshift, remshift = divmod(shiftby, PyLong_SHIFT) */
wordshift = (int)shiftby / PyLong_SHIFT; wordshift = shiftby / PyLong_SHIFT;
remshift = (int)shiftby - wordshift * PyLong_SHIFT; remshift = shiftby - wordshift * PyLong_SHIFT;
oldsize = ABS(a->ob_size); oldsize = ABS(a->ob_size);
newsize = oldsize + wordshift; newsize = oldsize + wordshift;