From da05d1413090b6aa8f728423db3279a0d5d0ce14 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 16 Sep 2011 15:49:22 -0500 Subject: [PATCH] e2fsck: handle null fs in print_pathname() testing fs for NULL in expand_percent_expression(): e2fsck_ctx = fs ? (e2fsck_t) fs->priv_data : NULL; implies that fs could be NULL, but it's passed to print_pathname() which defererences it without further testing. So make this safe by returning "???" for a nul fs. Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o --- e2fsck/message.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/e2fsck/message.c b/e2fsck/message.c index 565c3cd..f178321 100644 --- a/e2fsck/message.c +++ b/e2fsck/message.c @@ -203,8 +203,9 @@ static void print_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino) return; } - retval = ext2fs_get_pathname(fs, dir, ino, &path); - if (retval) + if (fs) + retval = ext2fs_get_pathname(fs, dir, ino, &path); + if (!fs || retval) fputs("???", stdout); else { safe_print(path, -1); -- 1.8.3.1