[2557] 2009-09-01 Vladimir Serbinenko <[email protected]>

Vladimir Serbinenko <[email protected]> Tue, 01 Sep 2009 19:07:44 +0000
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2557
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2557
Author:   phcoder
Date:     2009-09-01 19:07:42 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
2009-09-01  Vladimir Serbinenko  <[email protected]>

	* commands/loadenv.c (check_blocklists): Fix off-by-one error.
	(write_blocklists): Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/commands/loadenv.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-09-01 16:15:38 UTC (rev 2556)
+++ trunk/grub2/ChangeLog	2009-09-01 19:07:42 UTC (rev 2557)
@@ -1,3 +1,8 @@
+2009-09-01  Vladimir Serbinenko  <[email protected]>
+
+	* commands/loadenv.c (check_blocklists): Fix off-by-one error.
+	(write_blocklists): Likewise.
+
 2009-09-01  Colin Watson  <[email protected]>
 
 	* script/lua/grub_lua.h (fputs): Supply a format string as the first

Modified: trunk/grub2/commands/loadenv.c
===================================================================
--- trunk/grub2/commands/loadenv.c	2009-09-01 16:15:38 UTC (rev 2556)
+++ trunk/grub2/commands/loadenv.c	2009-09-01 19:07:42 UTC (rev 2557)
@@ -242,7 +242,7 @@
     part_start = 0;
 
   buf = grub_envblk_buffer (envblk);
-  for (p = blocklists, index = 0; p; p = p->next, index += p->length)
+  for (p = blocklists, index = 0; p; index += p->length, p = p->next)
     {
       char blockbuf[GRUB_DISK_SECTOR_SIZE];
 
@@ -278,7 +278,7 @@
     part_start = 0;
 
   index = 0;
-  for (p = blocklists; p; p = p->next, index += p->length)
+  for (p = blocklists; p; index += p->length, p = p->next)
     {
       if (grub_disk_write (disk, p->sector - part_start,
                            p->offset, p->length, buf + index))