From e184ac3a105a4a45b920bf2cdaa701a683c781a2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 19 Dec 2017 14:44:50 -0200 Subject: glob: Silence warning about void pointer arithmetic Sync with gnulib 0e14f025d2. Checked on x86_64-linux-gnu. * lib/glob.c (glob): Use a 'char *', not a 'void *', in pointer arithmetic. Signed-off-by: Adhemerval Zanella --- ChangeLog | 3 +++ posix/glob.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af45054..a28c50c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-12-19 Adhemerval Zanella + * 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 diff --git a/posix/glob.c b/posix/glob.c index 511ec4b..8557196 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); -- cgit v1.1