From c79314c9bd8efc6e521664bf4de182370c436c09 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Sat, 17 Jun 2017 18:09:23 -0400 Subject: Effectively updated to Scintilla 3.7.5 with select backports to 3.7.3. --- src/scintilla_backports/6171_99e46ea84433.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/scintilla_backports/6171_99e46ea84433.patch (limited to 'src/scintilla_backports/6171_99e46ea84433.patch') diff --git a/src/scintilla_backports/6171_99e46ea84433.patch b/src/scintilla_backports/6171_99e46ea84433.patch new file mode 100644 index 00000000..4b183244 --- /dev/null +++ b/src/scintilla_backports/6171_99e46ea84433.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User Neil +# Date 1491548935 -36000 +# Node ID 99e46ea84433f95e568fb9fdc7d4a92869e823ab +# Parent df221375187cab18a3e1c73ae83fa46805bf98db +Check index before checking value at index. + +diff -r df221375187c -r 99e46ea84433 src/CellBuffer.cxx +--- a/src/CellBuffer.cxx Fri Apr 07 17:08:12 2017 +1000 ++++ b/src/CellBuffer.cxx Fri Apr 07 17:08:55 2017 +1000 +@@ -348,12 +348,12 @@ + + int UndoHistory::StartRedo() { + // Drop any leading startAction +- if (actions[currentAction].at == startAction && currentAction < maxAction) ++ if (currentAction < maxAction && actions[currentAction].at == startAction) + currentAction++; + + // Count the steps in this action + int act = currentAction; +- while (actions[act].at != startAction && act < maxAction) { ++ while (act < maxAction && actions[act].at != startAction) { + act++; + } + return act - currentAction; -- cgit v1.2.3