From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 25 Feb 2015 15:12:26 +0000 (-0500)
Subject: fix merge_collapse to actually maintain the invariant it purports to (closes #23515)
X-Git-Tag: v2.7.10rc1~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=082a960425d23062f577650390a2d74ac98dd07d;p=thirdparty%2FPython%2Fcpython.git

fix merge_collapse to actually maintain the invariant it purports to (closes #23515)

See
de Gouw, Stijn and Rot, Jurriaan and de Boer, Frank S and Bubel, Richard and Hähnle, Reiner
"OpenJDK’s java.utils.Collection.sort() is broken: The good, the bad and the worst case"
---

diff --git a/Objects/listobject.c b/Objects/listobject.c
index f753643bd39a..1f43ba292c39 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1800,7 +1800,8 @@ merge_collapse(MergeState *ms)
     assert(ms);
     while (ms->n > 1) {
         Py_ssize_t n = ms->n - 2;
-        if (n > 0 && p[n-1].len <= p[n].len + p[n+1].len) {
+        if ((n > 0 && p[n-1].len <= p[n].len + p[n+1].len) ||
+            (n > 1 && p[n-2].len <= p[n-1].len + p[n].len)) {
             if (p[n-1].len < p[n+1].len)
                 --n;
             if (merge_at(ms, n) < 0)