[Debian-ha-commits] [ocfs2-tools] 03/58: fsck.ocfs2: Free 'ci' in each cycle of for loop in check_journal_walk

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch upstream
in repository ocfs2-tools.

commit 40ed543d451247e9a933a9368fe33dd777b5e3a3
Author: Jun Piao <piaojun at huawei.com>
Date:   Tue Jun 14 23:46:34 2016 +0800

    fsck.ocfs2: Free 'ci' in each cycle of for loop in check_journal_walk
    
    'ci' should be freed in each cycle of for loop in check_journal_walk.
    
    Signed-off-by: Jun Piao <piaojun at huawei.com>
    Reviewed-by: Joseph Qi <joseph.qi at huawei.com>
---
 fsck.ocfs2/journal.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fsck.ocfs2/journal.c b/fsck.ocfs2/journal.c
index bba8499..d0efc8b 100644
--- a/fsck.ocfs2/journal.c
+++ b/fsck.ocfs2/journal.c
@@ -925,10 +925,12 @@ static errcode_t check_journal_walk(o2fsck_state *ost,
 		ret = func(ost, ci, jc);
 		if (ret)
 			break;
-	}
 
-	if (ci)
 		ocfs2_free_cached_inode(fs, ci);
+		ci = NULL;
+	}
+
+	ocfs2_free_cached_inode(fs, ci);
 
 	return ret;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git