* grub-core/normal/charset.c (bidi_line_wrap): Fix a spurious warning

	and fix a case when line_start overflows.

diff --git a/ChangeLog b/ChangeLog
index 41613eec0c6eef2fbac3566f0520168fc9d2b863..719265ab445f427dcc32ba97a7dc0d95897ba1eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/normal/charset.c (bidi_line_wrap): Fix a spurious warning
+       and fix a case when line_start overflows.
+
 2012-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-reboot.in (usage): Mention id posibility.

diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
index 5e5e5eaeb45745fa35e6390e47fef8a296ed38b1..481e081ecad6d725de3d9593bcc2b0e7abafc361 100644 (file)
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -633,7 +633,7 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
          {
            int right_join = 0;
            signed i;
-           for (i = k - 1; i > (signed) line_start - 1 && i >= 0;
+           for (i = k - 1; i >= 0 && (unsigned) i >= line_start;
                 i--)
              {
                enum grub_join_type join_type = get_join_type (visual[i].base);