Fix unallocated memory access in insert_string
PATCH 1/1 Fix unallocated memory access in insert_string
When appending string at the end, there is nothing to shift down and (screen->line + 2) points beyond allocated array.
Signed-off-by Andrey Borzenkov <[email protected]>
--- ChangeLog | 5 +++++ grub-core/normal/menu_entry.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
ChangeLog +5 -0
@@ -1,3 +1,8 @@ +2013-02-19 Andrey Borzenkov <[email protected]> + + * grub-core/normal/menu_entry.c (insert_string): fix off by one + access to unallocated memory. + 2013-02-19 Paulo Flabiano Smorigo <[email protected]> Support Openfirmware disks with non-512B sectors.
grub-core/normal/menu_entry.c +6 -5
@@ -393,11 +393,12 @@ insert_string (struct screen *screen, const char *s, int update)if (! screen->lines)return 0 ; -/* Scroll down. */ -grub_memmove (screen->lines + screen->line +2 , - screen->lines + screen->line +1 , - ((screen->num_lines - screen->line -2 ) - *sizeof (struct line ))); +/* Shift down if not appending after the last line. */ +if (screen->line < screen->num_lines -2 ) +grub_memmove (screen->lines + screen->line +2 , + screen->lines + screen->line +1 , + ((screen->num_lines - screen->line -2 ) + *sizeof (struct line )));if (!init_line (screen, screen->lines + screen->line +1 ))return 0 ;
Signature · 1 line
tg: (cc35b49..) fu/insert_string-unallocated-memory (depends on: master)