Whamcloud - gitweb
e2fsprogs: fix freeing bitmap in allocation error path
authorLukas Czerner <lczerner@redhat.com>
Mon, 21 Mar 2011 10:13:41 +0000 (11:13 +0100)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 8 May 2011 22:06:30 +0000 (18:06 -0400)
In ext2fs_alloc_generic_bmap() error path, when new bitmap allocation
fails ext2fs_generic_bitmap should be freed, however in current state it
first frees ext2fs_generic_bitmap and then
ext2fs_generic_bitmap->description which is wrong. This commit fix the
free ordering.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
lib/ext2fs/gen_bitmap64.c

index df095ac..8b9e4c5 100644 (file)
@@ -129,8 +129,8 @@ errcode_t ext2fs_alloc_generic_bmap(ext2_filsys fs, errcode_t magic,
 
        retval = bitmap->bitmap_ops->new_bmap(fs, bitmap);
        if (retval) {
-               ext2fs_free_mem(&bitmap);
                ext2fs_free_mem(&bitmap->description);
+               ext2fs_free_mem(&bitmap);
                return retval;
        }