From: Satoru Takeuchi <[email protected]>
Date: Thu, 18 Dec 2014 14:35:22 +0900

@tmp is freed even if its allocation fails.

Signed-off-by: Satoru Takeuchi <[email protected]>

---
 cmds-property.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmds-property.c b/cmds-property.c
index a764293..a4bc127 100644
--- a/cmds-property.c
+++ b/cmds-property.c
@@ -140,31 +140,32 @@ static int check_is_root(const char *object)
        if (ret < 0) {
                fprintf(stderr, "ERROR: get_fsid for %s failed. %s\n", object,
                                strerror(-ret));
-               goto out;
+               goto free_tmp_out;
        }
 
        ret = get_fsid(tmp, fsid2, 1);
        if (ret == -ENOTTY) {
                ret = 0;
-               goto out;
+               goto free_tmp_out;
        } else if (ret == -ENOTDIR) {
                ret = 1;
-               goto out;
+               goto free_tmp_out;
        } else if (ret < 0) {
                fprintf(stderr, "ERROR: get_fsid for %s failed. %s\n", tmp,
                        strerror(-ret));
-               goto out;
+               goto free_tmp_out;
        }
 
        if (memcmp(fsid, fsid2, BTRFS_FSID_SIZE)) {
                ret = 0;
-               goto out;
+               goto free_tmp_out;
        }
 
        ret = 1;
 
-out:
+free_tmp_out:
        free(tmp);
+out:
        return ret;
 }
 
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to