]> granicus.if.org Git - python/commitdiff
avoid referencing out-of-bounds memory
authorBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 02:54:31 +0000 (21:54 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 15 Mar 2014 02:54:31 +0000 (21:54 -0500)
Objects/listobject.c

index 143c7b3788356cffe8724199c287fbc3519511b1..5f3e282827930cda623b3b5c81e0f1e79474f1cd 100644 (file)
@@ -2036,7 +2036,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);
     }