From: Pádraig Brady Date: Wed, 10 Jul 2013 00:07:57 +0000 (+0100) Subject: maint: avoid a valgrind memory leak warning from pinky X-Git-Tag: v8.22~105 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e0e9bf58fd5c9b6aa86c22c6351d830ed1c6eb;p=thirdparty%2Fcoreutils.git maint: avoid a valgrind memory leak warning from pinky 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. --- diff --git a/src/pinky.c b/src/pinky.c index e6838ae695..500f70a8b5 100644 --- a/src/pinky.c +++ b/src/pinky.c @@ -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