2008-09-28 Bean <bean123ch@gmail.com>

	* fs/ntfs.c (grub_ntfs_iterate_dir): Fix a bug in the previous patch.
	Thanks to Christian Franke for finding this bug.

diff --git a/ChangeLog b/ChangeLog
index d615f65ebbc9b5db97fc357872072b3f16f8b925..c9a38983e553905e5efdc7abb5c7192499cfd72d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-28  Bean  <bean123ch@gmail.com>
+
+       * fs/ntfs.c (grub_ntfs_iterate_dir): Fix a bug in the previous patch.
+       Thanks to Christian Franke for finding this bug.
+
 2008-09-25  Robert Millan  <rmh@aybabtu.com>
 
        * util/grub-mkdevicemap.c (make_device_map): Actually replace all

diff --git a/fs/ntfs.c b/fs/ntfs.c
index e0e50f1649b28f390942faa5d584b8c1ed254a33..22477c5321d489f3669bfd68124712775dc33043 100644 (file)
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -700,7 +700,7 @@ grub_ntfs_iterate_dir (grub_fshelp_node_t dir,
           int is_resident = (cur_pos[8] == 0);
 
           bitmap_len = ((is_resident) ? u32at (cur_pos, 0x10) :
-                        (cur_pos, 0x28));
+                        u32at (cur_pos, 0x28));
 
           bmp = grub_malloc (bitmap_len);
           if (bmp == NULL)