diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-02-25 10:16:56 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-02-25 10:16:56 -0500 |
| commit | 3281ecb6217bc7d60ab94c4df80519925336c10f (patch) | |
| tree | 4b5d5d36b37805cd1afb39b6cf302fba68ea283e /Objects/listobject.c | |
| parent | fb70a33619a6efa6cc07155684b0e5777abdf044 (diff) | |
| parent | d02de5889af09485ae6b4b80edbf16ff9bf91924 (diff) | |
| download | cpython-3281ecb6217bc7d60ab94c4df80519925336c10f.tar.gz | |
merge 3.4 (#23515)
Diffstat (limited to 'Objects/listobject.c')
| -rw-r--r-- | Objects/listobject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index e7c4c82703..8f88d18788 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -1832,7 +1832,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) |