diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-04-22 13:39:36 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-04-22 13:39:36 +0000 |
| commit | 9439cdddf7b43997cfed2fb3e4e55b989f6818fb (patch) | |
| tree | c9ec6c3b0f39491cdb5e1a9ca7248137008bd698 /src/memline.c | |
| parent | 77ab2801c793eafd4e683804eabcfc69a4371df8 (diff) | |
updated for version 7.2-153v7.2.153
Diffstat (limited to 'src/memline.c')
| -rw-r--r-- | src/memline.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/memline.c b/src/memline.c index f5a68b19fe..96261aba0e 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1554,10 +1554,15 @@ recover_names(fname, list, nr) for (i = 0; i < num_files; ++i) if (fullpathcmp(p, files[i], TRUE) & FPC_SAME) { + /* Remove the name from files[i]. Move further entries + * down. When the array becomes empty free it here, since + * FreeWild() won't be called below. */ vim_free(files[i]); - --num_files; - for ( ; i < num_files; ++i) - files[i] = files[i + 1]; + if (--num_files == 0) + vim_free(files); + else + for ( ; i < num_files; ++i) + files[i] = files[i + 1]; } } if (nr > 0) @@ -3522,7 +3527,7 @@ resolve_symlink(fname, buf) if (errno == EINVAL || errno == ENOENT) { /* Found non-symlink or not existing file, stop here. - * When at the first level use the unmodifed name, skip the + * When at the first level use the unmodified name, skip the * call to vim_FullName(). */ if (depth == 1) return FAIL; @@ -4560,7 +4565,7 @@ ml_updatechunk(buf, line, len, updtype) buf->b_ml.ml_chunksize + curix, (buf->b_ml.ml_usedchunks - curix) * sizeof(chunksize_T)); - /* Compute length of first half of lines in the splitted chunk */ + /* Compute length of first half of lines in the split chunk */ size = 0; linecnt = 0; while (curline < buf->b_ml.ml_line_count |