mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.0.0337: invalid memory access in :recover command
Problem: Invalid memory access in :recover command. Solution: Avoid access before directory name. (Dominique Pelle, closes #1488)
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user