aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-06 21:35:03 +0200
committerGitHub <noreply@github.com>2017-04-06 21:35:03 +0200
commit30e1cda8acb7bd8120348d1812cfd9ecd8be8528 (patch)
treead1359e372adf3d852375414f29d54c048c01998 /src
parentc501d7c432693705482f76a384a98b4b4c0ef1a9 (diff)
downloadrneovim-30e1cda8acb7bd8120348d1812cfd9ecd8be8528.tar.gz
rneovim-30e1cda8acb7bd8120348d1812cfd9ecd8be8528.tar.bz2
rneovim-30e1cda8acb7bd8120348d1812cfd9ecd8be8528.zip
completion: fix segfault with ignorecase+infercase (#6452)
Helped-by: Matthew Malcomson <hardenedapple@gmail.com> Closes #6451
Diffstat (limited to 'src')
-rw-r--r--src/nvim/edit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index da09aed3dc..b35504908e 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -2109,7 +2109,7 @@ int ins_compl_add_infercase(char_u *str, int len, int icase, char_u *fname, int
xfree(wca);
- return ins_compl_add(IObuff, len, icase, fname, NULL, true, dir, flags,
+ return ins_compl_add(IObuff, len, icase, fname, NULL, false, dir, flags,
false);
}
return ins_compl_add(str, len, icase, fname, NULL, false, dir, flags, false);
@@ -2146,7 +2146,7 @@ static int ins_compl_add(char_u *const str, int len,
os_breakcheck();
#define FREE_CPTEXT(cptext, cptext_allocated) \
do { \
- if (cptext_allocated) { \
+ if (cptext != NULL && cptext_allocated) { \
for (size_t i = 0; i < CPT_COUNT; i++) { \
xfree(cptext[i]); \
} \