bb11557 - freeing opts on exit after failed initgroups check

Cisco-Talos · Jun 13, 2016 · 17d1e36 · 17d1e36
1 parent f5bc94c
commit 17d1e36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/clamav-milter/clamav-milter.c b/clamav-milter/clamav-milter.c
@@ -301,11 +301,13 @@ int main(int argc, char **argv) {
 #ifdef HAVE_INITGROUPS
 	if(initgroups(user->pw_name, user->pw_gid)) {
 	    fprintf(stderr, "ERROR: initgroups() failed.\n");
+	    optfree(opts);
 	    return 1;
 	}
 #elif HAVE_SETGROUPS
 	if(setgroups(1, &user->pw_gid)) {
 	    fprintf(stderr, "ERROR: setgroups() failed.\n");
+	    optfree(opts);
 	    return 1;
 	}
 #endif

diff --git a/clamd/clamd.c b/clamd/clamd.c
@@ -219,12 +219,14 @@ int main(int argc, char **argv)
 #ifdef HAVE_INITGROUPS
 	if(initgroups(user->pw_name, user->pw_gid)) {
 		fprintf(stderr, "ERROR: initgroups() failed.\n");
+                optfree(opts);
 		return 1;
 	}
 #elif HAVE_SETGROUPS
 	if(setgroups(1, &user->pw_gid)) {
 		fprintf(stderr, "ERROR: setgroups() failed.\n");
-		return 1;
+                optfree(opts);
+                return 1;
 	}
 #endif
 

diff --git a/freshclam/freshclam.c b/freshclam/freshclam.c
@@ -422,11 +422,13 @@ main (int argc, char **argv)
 #ifdef HAVE_INITGROUPS
 	if (initgroups(dbowner, user->pw_gid)) {
 		logg ("^initgroups() failed.\n");
+                optfree (opts);
 		return FCE_USERORGROUP;
 	}
 #elif HAVE_SETGROUPS
 	if (setgroups(1, &user->pw_gid)) {
 		logg ("^setgroups() failed.\n");
+                optfree (opts);
 		return FCE_USERORGROUP;
 	}
 #endif