vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

improve the robustness of savedefault and default.

Browse source
This commit is contained in:
okuji 2001-02-02 13:39:59 +00:00
parent 00865a8027
commit dc1c0a6ccf
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2001-02-02 OKUJI Yoshinori <okuji@gnu.org>
* stage2/builtins.c (savedefault_func)
[!SUPPORT_DISKLESS && !GRUB_UTIL]: Check if the stage2 is
STAGE2_ID_STAGE2. Suggested by Jochen Hoenicke.
* stage2/stage2.c (cmain): If DEFAULT_ENTRY is out of entries,
reset DEFAULT_ENTRY to zero.
2001-02-02 OKUJI Yoshinori <okuji@gnu.org> 2001-02-02 OKUJI Yoshinori <okuji@gnu.org>
Make savedefault workable even with Stage 1.5. Reported by Make savedefault workable even with Stage 1.5. Reported by

9
stage2/builtins.c
View file

@ -3080,7 +3080,14 @@ savedefault_func (char *arg, int flags)
return 1; return 1;
} }
entryno_ptr = (int *) ((char *) buffer + STAGE2_SAVED_ENTRYNO); /* Sanity check. */
if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2)
{
errnum = ERR_BAD_VERSION;
return 1;
}
entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
/* Check if the saved entry number differs from current entry number. */ /* Check if the saved entry number differs from current entry number. */
if (*entryno_ptr != current_entryno) if (*entryno_ptr != current_entryno)

5
stage2/stage2.c
View file

@ -957,6 +957,11 @@ cmain (void)
grub_memmove (config_entries + config_len, menu_entries, menu_len); grub_memmove (config_entries + config_len, menu_entries, menu_len);
menu_entries = config_entries + config_len; menu_entries = config_entries + config_len;
/* Check if the default entry is present. Otherwise reset
DEFAULT_ENTRY. */
if (default_entry >= num_entries)
default_entry = 0;
if (is_preset) if (is_preset)
close_preset_menu (); close_preset_menu ();
else else