* grub-core/normal/charset.c (bidi_line_wrap): Fix out-of-range swap.

diff --git a/ChangeLog b/ChangeLog
index 7e146a89dc99d3bb3a0b961d35956381f661c0fc..530b2226677b9ad70cbb7f6637b96b6b5a47d85d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/charset.c (bidi_line_wrap): Fix out-of-range swap.
+
 2012-03-28  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Invoking grub-probe): New section.

diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
index 55151b944ff2d356fafc985b653f0d04f2d1e431..3a2f1820ad988a67dedb7bfecb3d15f9cad2a363 100644 (file)
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -577,7 +577,7 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
            /* FIXME: can be optimized.  */
            for (j = max_level; j > min_odd_level - 1; j--)
              {
-               unsigned in = 0;
+               unsigned in = line_start;
                unsigned i;
                for (i = line_start; i < k; i++)
                  {