aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-01-18 02:43:32 +0100
committerJustin M. Keyes <justinkz@gmail.com>2019-01-18 02:43:32 +0100
commit6cd3912a51e2c49d3ec7b9a52ff6f754537dd3ea (patch)
treed439fa51b2d86cceabe6f543afa430333d5e663f
parent8f9fc1f692292efe63b9e71bb6f6340bccf2b37f (diff)
downloadrneovim-6cd3912a51e2c49d3ec7b9a52ff6f754537dd3ea.tar.gz
rneovim-6cd3912a51e2c49d3ec7b9a52ff6f754537dd3ea.tar.bz2
rneovim-6cd3912a51e2c49d3ec7b9a52ff6f754537dd3ea.zip
clang/"null pointer dereference": expand_wildcards
This invariant is explained in aa39fc56f68e.
-rw-r--r--src/nvim/path.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 03de914e4f..7903e3f4f4 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -2039,6 +2039,7 @@ int expand_wildcards(int num_pat, char_u **pat, int *num_files, char_u ***files,
char_u *ffname;
// check all files in (*files)[]
+ assert(*num_files == 0 || *files != NULL);
for (i = 0; i < *num_files; i++) {
ffname = (char_u *)FullName_save((char *)(*files)[i], false);
assert((*files)[i] != NULL);
@@ -2056,16 +2057,16 @@ int expand_wildcards(int num_pat, char_u **pat, int *num_files, char_u ***files,
}
}
- /*
- * Move the names where 'suffixes' match to the end.
- */
+ //
+ // Move the names where 'suffixes' match to the end.
+ //
+ assert(*num_files == 0 || *files != NULL);
if (*num_files > 1) {
non_suf_match = 0;
for (i = 0; i < *num_files; i++) {
if (!match_suffix((*files)[i])) {
//
- // Move the name without matching suffix to the front
- // of the list.
+ // Move the name without matching suffix to the front of the list.
//
p = (*files)[i];
for (j = i; j > non_suf_match; j--) {