Fix upsizing of marks stack in pickle module. (GH-8860)

Previously marks stack was upsized even there was space for additional item.

diff --git a/Lib/test/test_pickle.py b/Lib/test/test_pickle.py
index 0051a0118a3f218d08ad7226c8a6c8482d57d339..b4bce7e6acebcd8d139fd0a0af0291acb4fcc714 100644 (file)
--- a/Lib/test/test_pickle.py
+++ b/Lib/test/test_pickle.py
@@ -309,9 +309,9 @@ if has_c_implementation:
                 return data
             check_unpickler(recurse(0), 32, 0)
             check_unpickler(recurse(1), 32, 20)
-            check_unpickler(recurse(20), 32, 58)
-            check_unpickler(recurse(50), 64, 58)
-            check_unpickler(recurse(100), 128, 134)
+            check_unpickler(recurse(20), 32, 20)
+            check_unpickler(recurse(50), 64, 60)
+            check_unpickler(recurse(100), 128, 140)
 
             u = unpickler(io.BytesIO(pickle.dumps('a', 0)),
                           encoding='ASCII', errors='strict')

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 517c99e1746b8867953189bb710731f25a5e9d91..39628fcef5d5c4c76149b23c99a87b79ce5dc211 100644 (file)
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -6288,7 +6288,7 @@ load_mark(UnpicklerObject *self)
      * mark stack.
      */
 
-    if ((self->num_marks + 1) >= self->marks_size) {
+    if (self->num_marks >= self->marks_size) {
         size_t alloc;
 
         /* Use the size_t type to check for overflow. */