From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 8 Nov 2011 14:36:50 +0000 (+0100)
Subject: x86/cpuid: Fix crash on -cpu ""
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=04c5b17a74c9d6c309181079f8949665b43b0164;p=qemu.git

x86/cpuid: Fix crash on -cpu ""

Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 99cff65aae..21e589675c 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -594,9 +594,9 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
     uint32_t numvalue;
 
     for (def = x86_defs; def; def = def->next)
-        if (!strcmp(name, def->name))
+        if (name && !strcmp(name, def->name))
             break;
-    if (kvm_enabled() && strcmp(name, "host") == 0) {
+    if (kvm_enabled() && name && strcmp(name, "host") == 0) {
         cpu_x86_fill_host(x86_cpu_def);
     } else if (!def) {
         goto error;