From 79120f8002f9a6abc348e6f3167d86e4a20e5cba Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 31 Aug 2003 20:56:57 -0400 Subject: [PATCH] mke2fs.c (set_fs_defaults): Fix bug which caused -T largefile or -T largefile4 to core dump due to a division by zero error. (Addressed Debian bug #207082) --- misc/ChangeLog | 6 ++++++ misc/mke2fs.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/misc/ChangeLog b/misc/ChangeLog index 52f7cb6..f93d887 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,9 @@ +2003-08-31 Theodore Ts'o + + * mke2fs.c (set_fs_defaults): Fix bug which caused -T largefile or + -T largefile4 to core dump due to a division by zero + error. (Addressed Debian bug #207082) + 2003-08-24 Theodore Ts'o * dumpe2fs.8.in, e2image.8.in, e2label.8.in, mke2fs.8.in, diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 1c98c50..a2c8553 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -171,11 +171,11 @@ static void set_fs_defaults(const char *fs_type, blocksize : p->inode_ratio; use_bsize = p->blocksize; } - if (sector_size && use_bsize < sector_size) - use_bsize = sector_size; if (blocksize <= 0) { if (use_bsize == DEF_MAX_BLOCKSIZE) use_bsize = sys_page_size; + if (sector_size && use_bsize < sector_size) + use_bsize = sector_size; if ((blocksize < 0) && (use_bsize < (-blocksize))) use_bsize = -blocksize; blocksize = use_bsize; -- 1.8.3.1