* grub-core/term/gfxterm.c (grub_gfxterm_putchar): Don't set values

outside of range.
sivom · Dec 25, 2011 · 63fa8ef · 63fa8ef
1 parent 4d8c476
commit 63fa8ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,11 @@
 2011-12-25  Vladimir Serbinenko  <[email protected]>
 
-	Avoid cutting in the middle of UTF-8 string.
+	* grub-core/term/gfxterm.c (grub_gfxterm_putchar): Don't set values
+	outside of range.
+
+2011-12-25  Vladimir Serbinenko  <[email protected]>
+
+	Avoid cutting in the middle of UTF-8 character.
 
 	* include/grub/charset.h (grub_getend): New function.
 	* grub-core/script/function.c (grub_script_function_find): Use

diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
@@ -893,7 +893,9 @@ grub_gfxterm_putchar (struct grub_term_output *term,
         {
           unsigned i;
 
-          for (i = 1; i < char_width; i++)
+          for (i = 1; i < char_width && p + i < 
+		 virtual_screen.text_buffer + virtual_screen.columns
+		 * virtual_screen.rows; i++)
             {
 	      grub_free (p[i].code);
               p[i].code = grub_unicode_glyph_from_code (' ');