* grub-core/gnulib/argp-fmtstream.c (__argp_get_display_len): Stop on

	\0.
	(add_length): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 64c5c5e8bc99cb0b187b0b3e591a0eabb2a86b2b..11af2092177be3438db1d76aa997b4c77e669601 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/gnulib/argp-fmtstream.c (__argp_get_display_len): Stop on
+       \0.
+       (add_length): Likewise.
+
 2012-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 2012-02-26  Lubomir Kundrak  <lkundrak@redhat.com>
 

diff --git a/grub-core/gnulib/argp-fmtstream.c b/grub-core/gnulib/argp-fmtstream.c
index f0ceade28e982d216b14c00da18c92bdf18590ff..01e7a478fb45ca37b785123489e07614392d5978 100644 (file)
--- a/grub-core/gnulib/argp-fmtstream.c
+++ b/grub-core/gnulib/argp-fmtstream.c
@@ -127,7 +127,7 @@ __argp_get_display_len (char *beg, char *end)
 
   memset (&ps, 0, sizeof (ps));
 
-  for (ptr = beg; ptr < end; )
+  for (ptr = beg; ptr < end && *ptr; )
     {
       wchar_t wc;
       size_t s;
@@ -148,7 +148,7 @@ add_length (char *ptr, char *end, size_t l)
 
   memset (&ps, 0, sizeof (ps));
 
-  while (ptr < end)
+  while (ptr < end && *ptr)
     {
       wchar_t wc;
       size_t s, k;