]> git.ipfire.org Git - thirdparty/coreutils.git/commitdiff
maint: avoid a valgrind memory leak warning from pinky
authorPádraig Brady <P@draigBrady.com>
Wed, 10 Jul 2013 00:07:57 +0000 (01:07 +0100)
committerPádraig Brady <P@draigBrady.com>
Thu, 11 Jul 2013 23:24:13 +0000 (00:24 +0100)
Similarly to commit v8.21-84-g8d2da3f in src/uptime.c
avoid a "definitely lost" error from valgrind.  Note this
only happens with pinky when compiled without optimization,
in which case certain paths aren't eliminated casuing
valgrind to trigger the message.  Note also that coverity
flags this "resource leak" too.

* src/pinky.c (short_pinky): free utmp_buf for developer builds.

src/pinky.c

index e6838ae69504e0fbcc6bdbd1108b8082789c78ae..500f70a8b557c2fe25cfc92c68e9b6770cfe8222 100644 (file)
@@ -466,12 +466,14 @@ short_pinky (const char *filename,
              const int argc_names, char *const argv_names[])
 {
   size_t n_users;
-  STRUCT_UTMP *utmp_buf;
+  STRUCT_UTMP *utmp_buf = NULL;
 
   if (read_utmp (filename, &n_users, &utmp_buf, 0) != 0)
     error (EXIT_FAILURE, errno, "%s", filename);
 
   scan_entries (n_users, utmp_buf, argc_names, argv_names);
+
+  IF_LINT (free (utmp_buf));
 }
 
 static void