From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 4 Feb 2023 21:52:13 +0000 (+0100)
Subject: Use reallocarrayf() instead of its pattern
X-Git-Tag: 4.14.0-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190a702225b57eaf520b3c907070ccd649ebbb75;p=thirdparty%2Fshadow.git

Use reallocarrayf() instead of its pattern

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/libmisc/addgrps.c b/libmisc/addgrps.c
index 32f8af012..688e3e51f 100644
--- a/libmisc/addgrps.c
+++ b/libmisc/addgrps.c
@@ -29,7 +29,7 @@
  */
 int add_groups (const char *list)
 {
-	GETGROUPS_T *grouplist, *tmp;
+	GETGROUPS_T *grouplist;
 	size_t i;
 	int ngroups;
 	bool added;
@@ -88,14 +88,12 @@ int add_groups (const char *list)
 			fputs (_("Warning: too many groups\n"), shadow_logfd);
 			break;
 		}
-		tmp = (gid_t *) reallocarray (grouplist, (size_t)ngroups + 1, sizeof (GETGROUPS_T));
-		if (NULL == tmp) {
-			free (grouplist);
+		grouplist = (gid_t *) reallocarrayf (grouplist, (size_t)ngroups + 1, sizeof (GETGROUPS_T));
+		if (grouplist == NULL) {
 			return -1;
 		}
-		tmp[ngroups] = grp->gr_gid;
+		grouplist[ngroups] = grp->gr_gid;
 		ngroups++;
-		grouplist = tmp;
 		added = true;
 	}