[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

Sat Mar 15 03:48:00 CET 2014

http://hg.python.org/cpython/rev/061a9679ea2b
changeset: 89659:061a9679ea2b
parent: 89657:e68f156ea0e6
parent: 89658:d1b392141123
user: Benjamin Peterson <benjamin at python.org>
date: Fri Mar 14 21:47:36 2014 -0500
summary:
 merge 3.3
files:
 Objects/longobject.c | 3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -37,7 +37,8 @@
 static PyObject *
 get_small_int(sdigit ival)
 {
- PyObject *v = (PyObject*)(small_ints + ival + NSMALLNEGINTS);
+ assert(-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS);
+ PyObject *v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
 Py_INCREF(v);
 #ifdef COUNT_ALLOCS
 if (ival >= 0)
-- 
Repository URL: http://hg.python.org/cpython
