thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0355: using uninitialized memory when 'isfname' is empty

Browse Source 
Problem:    Using uninitialized memory when 'isfname' is empty.
Solution:   Don't call getpwnam() without an argument. (Dominique Pelle,
            closes #1464)
This commit is contained in:
Bram Moolenaar
2017-02-23 17:07:14 +01:00
parent 1c410400fa
commit 187a4f2814
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/misc1.c
View File

@@ -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)