grub2 1.96+20080724-4

[Robert Millan]

Hi,

Please consider approving grub2 1.96+20080724-4.  debdiff attached (it is
against -3 since the -2 -> -3 transition was already approved separately).

Note I set urgency=high in this one, which I intended but didn't do in previous
upload by mistake.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."
-------------- next part --------------
diff -u grub2-1.96+20080724/debian/changelog grub2-1.96+20080724/debian/changelog
--- grub2-1.96+20080724/debian/changelog
+++ grub2-1.96+20080724/debian/changelog
@@ -1,3 +1,10 @@
+grub2 (1.96+20080724-4) unstable; urgency=high
+
+  * patches/00_fix_overflow.diff: fix overflow with a big grub.cfg.
+    (Closes: #473543)
+
+ -- Felix Zielcke <fzielcke at z-51.de>  Tue, 29 Jul 2008 17:10:59 +0200
+
 grub2 (1.96+20080724-3) unstable; urgency=low
 
   [ Felix Zielcke ]
only in patch2:
unchanged:
--- grub2-1.96+20080724.orig/debian/patches/00_fix_overflow.diff
+++ grub2-1.96+20080724/debian/patches/00_fix_overflow.diff
@@ -0,0 +1,23 @@
+diff -ur grub2-1.96+20080724/normal/main.c grub2-1.96+20080724-2/normal/main.c
+--- grub2-1.96+20080724/normal/main.c	2008-02-02 17:48:52.000000000 +0100
++++ grub2-1.96+20080724-2/normal/main.c	2008-07-29 17:19:46.024867049 +0200
+@@ -97,9 +97,6 @@
+ 	}
+       else
+ 	{
+-	  if (c == '\n')
+-	    break;
+-
+ 	  if (pos >= max_len)
+ 	    {
+ 	      char *old_cmdline = cmdline;
+@@ -112,6 +109,9 @@
+ 		}
+ 	    }
+ 
++         if (c == '\n')
++           break;
++
+ 	  cmdline[pos++] = c;
+ 	}
+     }