diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-02-23 17:07:14 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-02-23 17:07:14 +0100 |
commit | 187a4f28140f10ff833862be7e3ef823d317e1c7 (patch) | |
tree | c0646d162d24d7ea01279a1563324be2b0b3d999 /src/misc1.c | |
parent | 1c410400fad79068b16dc4c6c7a023463a0858cf (diff) |
patch 8.0.0355: using uninitialized memory when 'isfname' is emptyv8.0.0355
Problem: Using uninitialized memory when 'isfname' is empty.
Solution: Don't call getpwnam() without an argument. (Dominique Pelle,
closes #1464)
Diffstat (limited to 'src/misc1.c')
-rw-r--r-- | src/misc1.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/misc1.c b/src/misc1.c index 17779ba0b6..9f867266f3 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -4028,15 +4028,12 @@ expand_env_esc( */ # if defined(HAVE_GETPWNAM) && defined(HAVE_PWD_H) { - struct passwd *pw; - /* Note: memory allocated by getpwnam() is never freed. * Calling endpwent() apparently doesn't help. */ - pw = getpwnam((char *)dst + 1); - if (pw != NULL) - var = (char_u *)pw->pw_dir; - else - var = NULL; + struct passwd *pw = (*dst == NUL) + ? NULL : getpwnam((char *)dst + 1); + + var = (pw == NULL) ? NULL : (char_u *)pw->pw_dir; } if (var == NULL) # endif @@ -9652,7 +9649,7 @@ expand_wildcards( # endif if (match_file_list(p_wig, (*files)[i], ffname)) { - /* remove this matching files from the list */ + /* remove this matching file from the list */ vim_free((*files)[i]); for (j = i; j + 1 < *num_files; ++j) (*files)[j] = (*files)[j + 1]; @@ -10736,14 +10733,15 @@ has_env_var(char_u *p) static int has_special_wildchar(char_u *p); /* - * Return TRUE if "p" contains a special wildcard character. - * Allowing for escaping. + * Return TRUE if "p" contains a special wildcard character, one that Vim + * cannot expand, requires using a shell. */ static int has_special_wildchar(char_u *p) { for ( ; *p; mb_ptr_adv(p)) { + /* Allow for escaping. */ if (*p == '\\' && p[1] != NUL) ++p; else if (vim_strchr((char_u *)SPECIAL_WILDCHAR, *p) != NULL) |