diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-16 12:37:54 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-05-16 12:37:54 (GMT) |
commit | a103b96a80f049f68ccf2dd3d5d7858b26a27e94 (patch) | |
tree | 273d34aaef693b979534b1bfc126ec4560b27a3b | |
parent | 5cdc6308b6ac134ab65f2001e37b0c067dadef7d (diff) | |
download | cpython-a103b96a80f049f68ccf2dd3d5d7858b26a27e94.zip cpython-a103b96a80f049f68ccf2dd3d5d7858b26a27e94.tar.gz cpython-a103b96a80f049f68ccf2dd3d5d7858b26a27e94.tar.bz2 |
Issue #14829: Fix bisect and range() indexing with large indices (>= 2 ** 32) under 64-bit Windows.
-rw-r--r-- | Misc/NEWS | 3 | ||||
-rw-r--r-- | Modules/_bisectmodule.c | 3 | ||||
-rw-r--r-- | Objects/rangeobject.c | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -63,6 +63,9 @@ Core and Builtins Library ------- +- Issue #14829: Fix bisect and range() indexing with large indices + (>= 2 ** 32) under 64-bit Windows. + - Issue #14777: tkinter may return undecoded UTF-8 bytes as a string when accessing the Tk clipboard. Modify clipboad_get() to first request type UTF8_STRING when no specific type is requested in an X11 windowing diff --git a/Modules/_bisectmodule.c b/Modules/_bisectmodule.c index 93d0eed..eae2978 100644 --- a/Modules/_bisectmodule.c +++ b/Modules/_bisectmodule.c @@ -3,6 +3,7 @@ Converted to C by Dmitry Vasiliev (dima at hlabs.spb.ru). */ +#define PY_SSIZE_T_CLEAN #include "Python.h" static Py_ssize_t @@ -192,7 +193,7 @@ insort_left(PyObject *self, PyObject *args, PyObject *kw) if (PyList_Insert(list, index, item) < 0) return NULL; } else { - result = PyObject_CallMethod(list, "insert", "iO", index, item); + result = PyObject_CallMethod(list, "insert", "nO", index, item); if (result == NULL) return NULL; Py_DECREF(result); diff --git a/Objects/rangeobject.c b/Objects/rangeobject.c index 58d373c..935b205 100644 --- a/Objects/rangeobject.c +++ b/Objects/rangeobject.c @@ -307,7 +307,7 @@ compute_range_item(rangeobject *r, PyObject *arg) static PyObject * range_item(rangeobject *r, Py_ssize_t i) { - PyObject *res, *arg = PyLong_FromLong(i); + PyObject *res, *arg = PyLong_FromSsize_t(i); if (!arg) { return NULL; } |