diff options
| author | Gene Cumm <gene.cumm@gmail.com> | 2016-01-19 06:37:41 -0500 |
|---|---|---|
| committer | Gene Cumm <gene.cumm@gmail.com> | 2016-01-19 06:41:59 -0500 |
| commit | 7cd1ed60e37f36db859a2ca3d6ee261f98dafdac (patch) | |
| tree | faa89c0124e259f8d63bb1da2755b9da42b14e6e /com32/elflink/ldlinux/execute.c | |
| parent | 496bb8c2a19ccf9e8c6c67b925c492c924c9378a (diff) | |
| parent | 19d0d592ee115e8772b7dc6d5594748a49b63b0c (diff) | |
| download | syslinux-7cd1ed60e37f36db859a2ca3d6ee261f98dafdac.tar.gz | |
Merge 'git://github.com/Celelibi/syslinux.git/fix/bios/tail-call-stack-overflows'
FIXME: this circumvents some of the issue but is not the cleanest and may
reoccur.
Diffstat (limited to 'com32/elflink/ldlinux/execute.c')
| -rw-r--r-- | com32/elflink/ldlinux/execute.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c index 653c880d..39555715 100644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -44,6 +44,7 @@ const struct image_types image_boot_types[] = { { NULL, 0 }, }; +extern jmp_buf __return_to_command_prompt; extern int create_args_and_load(char *); __export void execute(const char *cmdline, uint32_t type, bool sysappend) @@ -136,7 +137,8 @@ __export void execute(const char *cmdline, uint32_t type, bool sysappend) /* Restore the console */ ldlinux_console_init(); - ldlinux_enter_command(); + /* Jump back to the main to call ldlinux_enter_command */ + longjmp(__return_to_command_prompt, 1); } else if (type == IMAGE_TYPE_CONFIG) { char *argv[] = { LDLINUX, NULL, NULL }; char *config; |