From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 18 Jul 2009 14:02:41 +0000 (-0400)
Subject: libext2fs: fix memory leak in error path in ext2fs_block_iterate2()
X-Git-Tag: v1.41.9~38
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9922c53a4df10e660a1b425629a1f4db2b4fc03f;p=tools%2Fe2fsprogs.git

libext2fs: fix memory leak in error path in ext2fs_block_iterate2()

Reported-by: Nic Case <number9652@yahoo.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/lib/ext2fs/block.c b/lib/ext2fs/block.c
index de5342d..490116d 100644
--- a/lib/ext2fs/block.c
+++ b/lib/ext2fs/block.c
@@ -488,8 +488,10 @@ errcode_t ext2fs_block_iterate2(ext2_filsys fs,
 abort_exit:
 	if (ret & BLOCK_CHANGED) {
 		retval = ext2fs_write_inode(fs, ino, &inode);
-		if (retval)
-			return retval;
+		if (retval) {
+			ret |= BLOCK_ERROR;
+			ctx.errcode = retval;
+		}
 	}
 errout:
 	if (!block_buf)