diff options
Diffstat (limited to 'lib/glob.c')
| -rw-r--r-- | lib/glob.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/glob.c b/lib/glob.c index 9d677d9826..33030ec72b 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -800,6 +800,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), { size_t home_len = strlen (p->pw_dir); size_t rest_len = end_name == NULL ? 0 : strlen (end_name); + char *d; if (__glibc_unlikely (malloc_dirname)) free (dirname); @@ -819,8 +820,10 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int), } malloc_dirname = 1; } - *((char *) mempcpy (mempcpy (dirname, p->pw_dir, home_len), - end_name, rest_len)) = '\0'; + d = mempcpy (dirname, p->pw_dir, home_len); + if (end_name != NULL) + d = mempcpy (d, end_name, rest_len); + *d = '\0'; dirlen = home_len + rest_len; dirname_modified = 1; |