about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2017-07-19 13:14:34 -0400
committerDJ Delorie <dj@delorie.com>2017-07-19 13:17:03 -0400
commitf8cef4d07d9641e27629bd3ce2d13f5d702fb251 (patch)
treea7d3591b91a319798aa5f1cd476b166ce71b1a36
parent4f329ea996af7e3414b1806c86f6d32866d34b36 (diff)
downloadglibc-f8cef4d07d9641e27629bd3ce2d13f5d702fb251.tar.gz
glibc-f8cef4d07d9641e27629bd3ce2d13f5d702fb251.tar.xz
glibc-f8cef4d07d9641e27629bd3ce2d13f5d702fb251.zip
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.
-rw-r--r--ChangeLog4
-rw-r--r--grp/grp-merge.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d514f08b53..8618e26206 100644
--- 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 6590e5d823..035e7a604b 100644
--- 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++)