Patchwork libext2fs: don't break when ext2fs_clear_generic_bmap() for 32-bit bitmaps

login
register
mail settings
Submitter Theodore Ts'o
Date Dec. 5, 2011, 6:02 p.m.
Message ID <1323108165-1429-1-git-send-email-tytso@mit.edu>
Download mbox | patch
Permalink /patch/129390/
State Accepted
Headers show

Comments

Theodore Ts'o - Dec. 5, 2011, 6:02 p.m.
This is only an issue for programs compiled against e2fsprogs 1.41
that manipulate bitmaps directly.  Fortunately there are very few
programs which do that, especially those that try to clear a bitmap.

Addresses-Sourceforge-Bugs: #3451486

Reported-by: robi6@users.sourceforge.net
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 lib/ext2fs/gen_bitmap64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c
index 9dbbf9f..4dc4e08 100644
--- a/lib/ext2fs/gen_bitmap64.c
+++ b/lib/ext2fs/gen_bitmap64.c
@@ -297,8 +297,8 @@  void ext2fs_clear_generic_bmap(ext2fs_generic_bitmap bitmap)
 {
 	if (EXT2FS_IS_32_BITMAP(bitmap))
 		ext2fs_clear_generic_bitmap(bitmap);
-
-	bitmap->bitmap_ops->clear_bmap (bitmap);
+	else
+		bitmap->bitmap_ops->clear_bmap (bitmap);
 }
 
 int ext2fs_mark_generic_bmap(ext2fs_generic_bitmap bitmap,