david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from x86-sec/optarg-bug

Browse Source 
Qemu nyx options parsing / optarg bug
This commit is contained in:
Sergej Schumilo 2022-04-06 17:27:39 +02:00 committed by GitHub
commit 8c192d29a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vl.c
View File

@ -2928,6 +2928,7 @@ int main(int argc, char **argv, char **envp)
#ifdef QEMU_NYX #ifdef QEMU_NYX
bool fast_vm_reload = false; bool fast_vm_reload = false;
state_init_global(); state_init_global();
char *fast_vm_reload_opt_arg = NULL;
#endif #endif
int i; int i;
@ -3083,9 +3084,11 @@ int main(int argc, char **argv, char **envp)
#ifdef QEMU_NYX #ifdef QEMU_NYX
case QEMU_OPTION_fast_vm_reload: case QEMU_OPTION_fast_vm_reload:
opts = qemu_opts_parse_noisily(qemu_find_opts("fast_vm_reload-opts"), opts = qemu_opts_parse_noisily(qemu_find_opts("fast_vm_reload-opts"),
optarg, true); if (!opts) { optarg, true);
if (!opts) {
exit(1); exit(1);
} }
fast_vm_reload_opt_arg = optarg;
fast_vm_reload = true; fast_vm_reload = true;
break; break;
#endif #endif
@ -4569,7 +4572,7 @@ int main(int argc, char **argv, char **envp)
exit(1); exit(1);
} }
QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("fast_vm_reload-opts"), optarg, true); QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("fast_vm_reload-opts"), fast_vm_reload_opt_arg, true);
const char* snapshot_path = qemu_opt_get(opts, "path"); const char* snapshot_path = qemu_opt_get(opts, "path");
const char* pre_snapshot_path = qemu_opt_get(opts, "pre_path"); const char* pre_snapshot_path = qemu_opt_get(opts, "pre_path");