[2649] 2009-10-25 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2649
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2649
Author:   robertmh
Date:     2009-10-24 23:36:00 +0000 (Sat, 24 Oct 2009)
Log Message:
-----------
2009-10-25  Robert Millan  <address@hidden>
2009-10-25  Vasily Averin  <address@hidden>

        * fs/ext2.c (grub_ext2_iterate_dir): Avoid infinite loop when
        `dirent.direntlen == 0'.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/fs/ext2.c

Property Changed:
----------------
    trunk/grub2/


Property changes on: trunk/grub2
___________________________________________________________________
Modified: bzr:revision-info
   - timestamp: 2009-10-25 01:27:46.312000036 +0200
committer: Robert Millan <address@hidden>
properties: 
        branch-nick: tmp

   + timestamp: 2009-10-25 01:35:02.167000055 +0200
committer: Robert Millan <address@hidden>
properties: 
        branch-nick: tmp

Modified: bzr:revision-id:v3-single1-dHJ1bmsvZ3J1YjI.
   - 1769 address@hidden
1770 address@hidden
1771 address@hidden
1772 address@hidden
1773 address@hidden

   + 1769 address@hidden
1770 address@hidden
1771 address@hidden
1772 address@hidden
1773 address@hidden
1774 address@hidden


Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-10-24 23:31:05 UTC (rev 2648)
+++ trunk/grub2/ChangeLog       2009-10-24 23:36:00 UTC (rev 2649)
@@ -1,5 +1,11 @@
 2009-10-25  Robert Millan  <address@hidden>
+2009-10-25  Vasily Averin  <address@hidden>
 
+       * fs/ext2.c (grub_ext2_iterate_dir): Avoid infinite loop when
+       `dirent.direntlen == 0'.
+
+2009-10-25  Robert Millan  <address@hidden>
+
        * fs/cpio.c [MODE_USTAR]: Initialize `tar' module instead of
        `cpio'.
        [! MODE_USTAR]: Initialize `cpio' module instead of `tar'.

Modified: trunk/grub2/fs/ext2.c
===================================================================
--- trunk/grub2/fs/ext2.c       2009-10-24 23:31:05 UTC (rev 2648)
+++ trunk/grub2/fs/ext2.c       2009-10-24 23:36:00 UTC (rev 2649)
@@ -649,6 +649,9 @@
       if (grub_errno)
        return 0;
 
+      if (dirent.direntlen == 0)
+        return 0;
+
       if (dirent.namelen != 0)
        {
          char filename[dirent.namelen + 1];