python · benjaminp · Sep 21, 2018 · benjaminp · Sep 21, 2018 · benjaminp
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -7061,7 +7057,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj)
  error:
    if (new_memo_size) {
        i = new_memo_size;
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
    Py_ssize_t to_process;

    assert(min_size > 0);

    /* Find the smallest valid table size >= min_size. */
-    while (new_size < min_size && new_size > 0)
+    while (new_size < min_size)
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -909,7 +909,8 @@ PyMemoTable_Set(PyMemoTable *self, PyObject *key, Py_ssize_t value)
     * Very large memo tables (over 50K items) use doubling instead.
     * This may help applications with severe memory constraints.
     */
-    if (!(self->mt_used * 3 >= (self->mt_mask + 1) * 2))
+    size_t triple_used = self->mt_used * 3;
+    if (triple_used > self->mt_used && triple_used < self->mt_allocated * 2)