btrfs-progs: fix memory leak on error path
authorEryu Guan <guaneryu@gmail.com>
Mon, 19 Oct 2015 11:37:57 +0000 (19:37 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 2 Nov 2015 08:35:02 +0000 (09:35 +0100)
dev_scans and t_scans should be freed on malloc error.

Signed-off-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
chunk-recover.c

index d0ca920..f8693f7 100644 (file)
@@ -846,11 +846,16 @@ static int scan_devices(struct recover_control *rc)
        if (!dev_scans)
                return -ENOMEM;
        t_scans = (pthread_t *)malloc(sizeof(pthread_t) * devnr);
-       if (!t_scans)
+       if (!t_scans) {
+               free(dev_scans);
                return -ENOMEM;
+       }
        t_rets = (long *)malloc(sizeof(long) * devnr);
-       if (!t_rets)
+       if (!t_rets) {
+               free(dev_scans);
+               free(t_scans);
                return -ENOMEM;
+       }
 
        list_for_each_entry(dev, &rc->fs_devices->devices, dev_list) {
                fd = open(dev->name, O_RDONLY);