ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

in get_real_dir_from_tilde(), fix segfault when dealing with directory 

names that begin with "~", but that aren't users' home directories


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4072 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2007-04-17 03:43:59 +00:00
parent e081fb9d54
commit a1cf6be436
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-16 David Lawrence Ramsey <pooka109@gmail.com>
* files.c (get_real_dir_from_tilde): Fix segfault when dealing
with directory names that begin with "~", but that aren't users'
home directories. (DLR, found by Justin Fletcher)
2007-04-11 Mike Frysinger <vapier@gentoo.org> 2007-04-11 Mike Frysinger <vapier@gentoo.org>
* doc/syntax/asm.nanorc, doc/syntax/c.nanorc, * doc/syntax/asm.nanorc, doc/syntax/c.nanorc,

5
src/files.c
View File

@ -1979,7 +1979,7 @@ char *real_dir_from_tilde(const char *buf)
if (buf[0] == '~') { if (buf[0] == '~') {
size_t i; size_t i;
const char *tilde_dir; const char *tilde_dir = NULL;
/* Figure out how much of the str we need to compare. */ /* Figure out how much of the str we need to compare. */
for (i = 1; buf[i] != '/' && buf[i] != '\0'; i++) for (i = 1; buf[i] != '/' && buf[i] != '\0'; i++)
@ -1997,7 +1997,8 @@ char *real_dir_from_tilde(const char *buf)
} while (userdata != NULL && } while (userdata != NULL &&
strncmp(userdata->pw_name, buf + 1, i - 1) != 0); strncmp(userdata->pw_name, buf + 1, i - 1) != 0);
endpwent(); endpwent();
tilde_dir = userdata->pw_dir; if (userdata != NULL)
tilde_dir = userdata->pw_dir;
} }
if (tilde_dir != NULL) { if (tilde_dir != NULL) {