diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-18 16:59:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-18 16:59:02 +0100 |
| commit | c525e3a1c20f6b5d9809c8b84f80090a8e416c92 (patch) | |
| tree | 97e0b308f04483514caeb9fe18027583d3fae376 /src/memline.c | |
| parent | 3df0173fa6d0418e89ef4e9c1d04a97c92eec27c (diff) | |
| download | vim-git-c525e3a1c20f6b5d9809c8b84f80090a8e416c92.tar.gz | |
patch 8.0.0337: invalid memory access in :recover commandv8.0.0337
Problem: Invalid memory access in :recover command.
Solution: Avoid access before directory name. (Dominique Pelle,
closes #1488)
Diffstat (limited to 'src/memline.c')
| -rw-r--r-- | src/memline.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/memline.c b/src/memline.c index 5874b5d69..df799b1b2 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1863,8 +1863,10 @@ recover_names( else { #if defined(UNIX) || defined(WIN3264) - p = dir_name + STRLEN(dir_name); - if (after_pathsep(dir_name, p) && p[-1] == p[-2]) + int len = STRLEN(dir_name); + + p = dir_name + len; + if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2]) { /* Ends with '//', Use Full path for swap name */ tail = make_percent_swname(dir_name, fname_res); @@ -3922,8 +3924,10 @@ makeswapname( #endif #if defined(UNIX) || defined(WIN3264) /* Need _very_ long file names */ - s = dir_name + STRLEN(dir_name); - if (after_pathsep(dir_name, s) && s[-1] == s[-2]) + int len = STRLEN(dir_name); + + s = dir_name + len; + if (after_pathsep(dir_name, s) && len > 1 && s[-1] == s[-2]) { /* Ends with '//', Use Full path */ r = NULL; if ((s = make_percent_swname(dir_name, fname)) != NULL) |