diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2001-06-12 22:35:00 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2001-06-12 22:35:00 +0000 |
| commit | 28cf9041b8f793f2116893306fe55ed151f8ad91 (patch) | |
| tree | 698f718f8f4d48e3511d09a9056a4882324dd082 /misc | |
| parent | 3034f62a0f9c31e6dce8bd1237cffd3851847250 (diff) | |
| download | e2fsprogs-28cf9041b8f793f2116893306fe55ed151f8ad91.tar.gz | |
ChangeLog, fsck.c:
fsck.c (device_already_active): Fixed bug which can cause fsck to core
dump if there are a mix of devices with standard and non-standard
names.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/ChangeLog | 6 | ||||
| -rw-r--r-- | misc/fsck.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog index 64814d1a..747ddcf9 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,9 @@ +2001-06-12 Theodore Tso <tytso@valinux.com> + + * fsck.c (device_already_active): Fixed bug which can cause fsck + to core dump if there are a mix of devices with standard + and non-standard names. + 2001-06-07 Theodore Tso <tytso@valinux.com> * chattr.c, lsattr.c: Don't use _FILE_BITS_OFFSET method of using diff --git a/misc/fsck.c b/misc/fsck.c index e242b97e..17ac42dd 100644 --- a/misc/fsck.c +++ b/misc/fsck.c @@ -821,7 +821,7 @@ static int device_already_active(char *device) if (!base) return (instance_list != 0); for (inst = instance_list; inst; inst = inst->next) { - if (!strcmp(base, inst->base_device)) { + if (!inst->base_device || !strcmp(base, inst->base_device)) { free(base); return 1; } |