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

merge 3.3

This commit is contained in:
Benjamin Peterson 2014-03-14 21:54:41 -05:00
parent dfa822811a ef87f8cb57
commit 1aca78da62
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/listobject.c
View File

@ -2043,7 +2043,7 @@ fail:
if (keys != NULL) {
for (i = 0; i < saved_ob_size; i++)
Py_DECREF(keys[i]);
if (keys != &ms.temparray[saved_ob_size+1])
if (saved_ob_size >= MERGESTATE_TEMP_SIZE/2)
PyMem_FREE(keys);
}

3
Objects/longobject.c
View File

@ -37,8 +37,9 @@ Py_ssize_t quick_int_allocs, quick_neg_int_allocs;
static PyObject *
get_small_int(sdigit ival)
{
PyObject *v;
assert(-NSMALLNEGINTS <= ival && ival < NSMALLPOSINTS);
PyObject *v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
v = (PyObject *)&small_ints[ival + NSMALLNEGINTS];
Py_INCREF(v);
#ifdef COUNT_ALLOCS
if (ival >= 0)