From ab1bb725265ea212e89320f4bbbad9a2c6488cb9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 16 Jan 2012 10:15:02 +0000
Subject: resize2fs-M: fix double-free along error path (thanks Matthew Booth).
 (cherry picked from commit b1ea8a7808744068fe0d1306d1005e841a570b4c)

---
 daemon/ext2.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/daemon/ext2.c b/daemon/ext2.c
index f3d23300..d85c9fd4 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -277,12 +277,10 @@ do_resize2fs_M (const char *device)
 
   r = command (NULL, &err, prog, "-M", device, NULL);
   if (r == -1) {
-    if (strstr (err, "e2fsck -f")) {
-      free (err);
+    if (strstr (err, "e2fsck -f"))
       reply_with_error ("you need to run e2fsck with the correct and/or forceall options first");
-    } else {
+    else
       reply_with_error ("%s", err);
-    }
     free (err);
     return -1;
   }
-- 
cgit