From: Adhemerval Zanella Date: Tue, 19 Dec 2017 16:44:50 +0000 (-0200) Subject: glob: Silence warning about void pointer arithmetic X-Git-Tag: glibc-2.27~242 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e184ac3a105a4a45b920bf2cdaa701a683c781a2;p=thirdparty%2Fglibc.git 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 --- diff --git a/ChangeLog b/ChangeLog index af450546ebf..a28c50c869a 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 511ec4bbc0f..85571963aa1 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);