mirror of https://github.com/vitalif/e2fsprogs
libext2fs: Fix reading bitmaps from e2image files
Fix a signed vs. unsigned bug that was accidentally introduced in
commit f1f115a7
, which was introduced in e2fsprogs 1.41.0
Addresses-Debian-Bug: #495830
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
bitmap-optimize
parent
c89f1b4ca5
commit
57fd39e943
|
@ -139,8 +139,8 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
|
||||||
char *block_bitmap = 0, *inode_bitmap = 0;
|
char *block_bitmap = 0, *inode_bitmap = 0;
|
||||||
char *buf;
|
char *buf;
|
||||||
errcode_t retval;
|
errcode_t retval;
|
||||||
unsigned int block_nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
|
int block_nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
|
||||||
unsigned inode_nbytes = EXT2_INODES_PER_GROUP(fs->super) / 8;
|
int inode_nbytes = EXT2_INODES_PER_GROUP(fs->super) / 8;
|
||||||
int csum_flag = 0;
|
int csum_flag = 0;
|
||||||
int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
|
int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE;
|
||||||
unsigned int cnt;
|
unsigned int cnt;
|
||||||
|
@ -169,7 +169,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
|
||||||
if (retval)
|
if (retval)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
retval = ext2fs_get_mem(do_image ? fs->blocksize :
|
retval = ext2fs_get_mem(do_image ? fs->blocksize :
|
||||||
block_nbytes, &block_bitmap);
|
(unsigned) block_nbytes, &block_bitmap);
|
||||||
if (retval)
|
if (retval)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
} else
|
} else
|
||||||
|
@ -182,7 +182,7 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
|
||||||
if (retval)
|
if (retval)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
retval = ext2fs_get_mem(do_image ? fs->blocksize :
|
retval = ext2fs_get_mem(do_image ? fs->blocksize :
|
||||||
inode_nbytes, &inode_bitmap);
|
(unsigned) inode_nbytes, &inode_bitmap);
|
||||||
if (retval)
|
if (retval)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
} else
|
} else
|
||||||
|
|
Loading…
Reference in New Issue