Fix cast-after-dereference

Original code was dereferencing a char*, then casting the value
to size_t.  Should cast the pointer to size_t* then deference.

diff --git a/ChangeLog b/ChangeLog
index d514f08b530684dbbb039ed985dcd8a465ddae77..8618e26206f6db16939efcb0d3d0b9d4d22b8d8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-19  DJ Delorie  <dj@delorie.com>
+
+       * grp/grp-merge.c (libc_hidden_def): Fix cast-after-dereference.
+
 2017-07-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #21741]

diff --git a/grp/grp-merge.c b/grp/grp-merge.c
index 6590e5d82350c08908dd8f1d71cb4a3a0a5ee9a5..035e7a604bbb71e0c3b282f62e847d43a03ed85e 100644 (file)
--- a/grp/grp-merge.c
+++ b/grp/grp-merge.c
@@ -137,7 +137,7 @@ __merge_grp (struct group *savedgrp, char *savedbuf, char *savedend,
 
   /* Get the count of group members from the last sizeof (size_t) bytes in the
      mergegrp buffer.  */
-  savedmemcount = (size_t) *(savedend - sizeof (size_t));
+  savedmemcount = *(size_t *) (savedend - sizeof (size_t));
 
   /* Get the count of new members to add.  */
   for (memcount = 0; mergegrp->gr_mem[memcount]; memcount++)