diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | posix/glob.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index af450546eb..a28c50c869 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-12-19 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * lib/glob.c (glob): Use a 'char *', not a 'void *', in pointer + arithmetic. + * lib/glob.c (glob): Do not pass NULL to mempcpy. 2017-12-19 Joseph Myers <joseph@codesourcery.com> diff --git a/posix/glob.c b/posix/glob.c index 511ec4bbc0..85571963aa 100644 --- a/posix/glob.c +++ b/posix/glob.c @@ -641,7 +641,8 @@ __glob (const char *pattern, int flags, int (*errfunc) (const char *, int), { # if defined HAVE_GETPWNAM_R || defined _LIBC size_t ssize = strlen (s.data) + 1; - err = getpwnam_r (s.data, &pwbuf, s.data + ssize, + char *sdata = s.data; + err = getpwnam_r (sdata, &pwbuf, sdata + ssize, s.length - ssize, &p); # else p = getpwnam (s.data); |