summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-28 14:05:38 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-28 14:05:38 +0000
commitea6e4fe2dd3594d04c03ddb0befc1c4a82ab4e83 (patch)
tree7fd1caa836ded5f601f9ddb4c66b2908f25878da /vl.c
parent175087965268c2792cf6bbb524dbccaadcf1fca4 (diff)
downloadqemu-ea6e4fe2dd3594d04c03ddb0befc1c4a82ab4e83.tar.gz
Fix segfault when printing the help text, spotted by Stefan Weil.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3030 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vl.c b/vl.c
index 172b5ab155..6006e1be49 100644
--- a/vl.c
+++ b/vl.c
@@ -6568,7 +6568,7 @@ int main_loop(void)
return ret;
}
-void help(void)
+static void help(const char *optarg)
{
printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2007 Fabrice Bellard\n"
"usage: %s [options] [disk_image]\n"
@@ -7450,12 +7450,12 @@ int main(int argc, char **argv)
break;
#endif
case QEMU_OPTION_h:
- help();
+ help(optarg);
break;
case QEMU_OPTION_m:
ram_size = atoi(optarg) * 1024 * 1024;
if (ram_size <= 0)
- help();
+ help(optarg);
if (ram_size > PHYS_RAM_MAX_SIZE) {
fprintf(stderr, "qemu: at most %d MB RAM can be simulated\n",
PHYS_RAM_MAX_SIZE / (1024 * 1024));
@@ -7741,7 +7741,7 @@ int main(int argc, char **argv)
hd_filename[0] == '\0' &&
(cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') &&
fd_filename[0] == '\0')
- help();
+ help("");
/* boot to floppy or the default cd if no hard disk defined yet */
if (hd_filename[0] == '\0' && boot_device == 'c') {