Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu: Fix issue where command line buffer was allocated in conventional memory and subsequently discarded

Browse Source
This commit is contained in:
mintsuki 2020-12-01 03:09:38 +01:00
parent 9b7f9e4209
commit 4c09663a28
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine-pxe.bin
View File

Binary file not shown.

BIN
limine.bin
View File

Binary file not shown.

BIN
stage2.map
View File

Binary file not shown.

18
stage2/menu.c
View File

@ -37,9 +37,6 @@ static void cursor_fwd(void) {
set_cursor_pos(x, y); set_cursor_pos(x, y);
} }
static char *cmdline;
#define CMDLINE_MAX 1024
#define EDITOR_MAX_BUFFER_SIZE 4096 #define EDITOR_MAX_BUFFER_SIZE 4096
static size_t get_line_offset(size_t *displacement, size_t index, const char *buffer) { static size_t get_line_offset(size_t *displacement, size_t index, const char *buffer) {
@ -241,9 +238,7 @@ static int print_tree(int level, int base_index, int selected_entry,
return max_entries; return max_entries;
} }
char *menu(char **cmdline_ret) { char *menu(char **cmdline) {
cmdline = conv_mem_alloc(CMDLINE_MAX);
struct menu_entry *selected_menu_entry; struct menu_entry *selected_menu_entry;
int selected_entry = 0; int selected_entry = 0;
@ -380,15 +375,14 @@ timeout_aborted:
goto refresh; goto refresh;
} }
enable_cursor(); enable_cursor();
cmdline = config_get_value(selected_menu_entry->body, 0, "KERNEL_CMDLINE"); *cmdline = config_get_value(selected_menu_entry->body, 0, "KERNEL_CMDLINE");
if (!cmdline) { if (!*cmdline) {
cmdline = config_get_value(selected_menu_entry->body, 0, "CMDLINE"); *cmdline = config_get_value(selected_menu_entry->body, 0, "CMDLINE");
} }
if (!cmdline) { if (!*cmdline) {
cmdline[0] = '\0'; *cmdline = "";
} }
clear(true); clear(true);
*cmdline_ret = cmdline;
term_double_buffer(false); term_double_buffer(false);
return selected_menu_entry->body; return selected_menu_entry->body;
case 'e': { case 'e': {