rehash.c (copy_dir_entries): Fix bug which caused corrupted

	directories if there are 4 or 8 bytes left over in a
	directory page when optimizing/reindexing a directory.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 7833872f751779735d602f2e44f067f43ce68355..744c95b652d354992193b3386759da7febc71c52 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-06  Theodore Ts'o  <tytso@mit.edu>
+
+       * rehash.c (copy_dir_entries): Fix bug which caused corrupted
+               directories if there are 4 or 8 bytes left over in a
+               directory page when optimizing/reindexing a directory.
+
 2001-08-31  Theodore Tso  <tytso@thunk.org>
 
        * Release of E2fsprogs 1.28

diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
index 2c64ec4a34906f19289ca9bc987b4819f0aecfeb..4ceb3e5812940c206ef06b6da6e7041bcd84360e 100644 (file)
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c
@@ -309,6 +309,7 @@ static errcode_t copy_dir_entries(ext2_filsys fs,
                if (left < 12) {
                        dirent->rec_len += left;
                        offset += left;
+                       left = 0;
                }
                prev_hash = ent->hash;
        }