]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
findmnt: fix couple memory leaks [cppcheck]
authorSami Kerola <kerolasa@iki.fi>
Sun, 12 Feb 2017 20:42:49 +0000 (20:42 +0000)
committerKarel Zak <kzak@redhat.com>
Mon, 20 Feb 2017 12:00:58 +0000 (13:00 +0100)
In both cases FILE *f was leaked.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
misc-utils/findmnt-verify.c

index b2a88c5f6b023c360e4740636a786e921da2fbaf..e3fb391d4e463c90235d258f537f80d9830cd3fc 100644 (file)
@@ -328,14 +328,15 @@ static int read_proc_filesystems(struct verify_context *vfy)
 
                rc = add_filesystem(vfy, cp);
                if (rc)
-                       return rc;
+                       break;
        }
        fclose(f);
-       return 0;
+       return rc;
 }
 
 static int read_kernel_filesystems(struct verify_context *vfy)
 {
+       int rc = 0;
 #ifdef __linux__
        struct utsname uts;
        FILE *f;
@@ -351,7 +352,6 @@ static int read_kernel_filesystems(struct verify_context *vfy)
 
        while (!feof(f)) {
                char *p, *name;
-               int rc;
 
                if (!fgets(buf, sizeof(buf), f))
                        break;
@@ -377,11 +377,11 @@ static int read_kernel_filesystems(struct verify_context *vfy)
 
                rc = add_filesystem(vfy, name);
                if (rc)
-                       return rc;
+                       break;
        }
        fclose(f);
 #endif /* __linux__ */
-       return 0;
+       return rc;
 }
 
 static int verify_fstype(struct verify_context *vfy)