aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-11-21 16:28:50 +0100
committerDan Pasanen <dan.pasanen@gmail.com>2015-11-24 10:06:19 -0600
commitf0bbb13fd644b56a8dc5f16ac248d8f7f95ff946 (patch)
treeda1c088c42184f98148a3d6406a9d3c2db81d2cc
parent3b80b9545315ad32736a3d5cac2431a8c89bcb8b (diff)
downloadandroid_external_vim-f0bbb13fd644b56a8dc5f16ac248d8f7f95ff946.tar.gz
android_external_vim-f0bbb13fd644b56a8dc5f16ac248d8f7f95ff946.tar.bz2
android_external_vim-f0bbb13fd644b56a8dc5f16ac248d8f7f95ff946.zip
patch 7.4.933
Problem: Crash when using longest completion match. Solution: Fix array index.
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 33d612bfa..0aeb4b8c8 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3704,7 +3704,7 @@ ExpandOne(xp, str, orig, options, mode)
}
else
#endif
- c0 = xp->xp_files[i][len];
+ c0 = xp->xp_files[0][len];
for (i = 1; i < xp->xp_numfiles; ++i)
{
#ifdef FEAT_MBYTE
diff --git a/src/version.c b/src/version.c
index 30efcab42..f43cad884 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 933,
+/**/
932,
/**/
931,