* grub-core/kern/i386/pc/startup.S (grub_console_setcursor): Check

	cursor shape for sanity.

diff --git a/ChangeLog b/ChangeLog
index fbd4b2752850e43d8f064a9c62aece4c73509d97..128c5f9595a5ed16d77a7b10b02bb8a4e0bd67c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/i386/pc/startup.S (grub_console_setcursor): Check
+       cursor shape for sanity.
+
 2010-10-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * docs/grub.texi (Installation): Document buggy BIOS install.

diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index e03fc8301bf55250352e5ac99cd8654bb9677a66..6b43d9f1489dd55c5508459eb803582ed3b11f49 100644 (file)
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -820,6 +820,10 @@ FUNCTION(grub_console_setcursor)
        DATA32  call    real_to_prot
        .code32
 
+       cmp     %cl, %ch
+       jb      3f
+       movw    $0x0d0e, %cx
+3:     
        movw    %cx, console_cursor_shape
 1:
        /* set %cx to the designated cursor shape */