From: Markus Armbruster Date: Tue, 8 Nov 2011 14:36:48 +0000 (+0100) Subject: x86/cpuid: Convert remaining strdup() to g_strdup() X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~17^2~1397 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3c481b357ee6f78d3df10ee30407fa05d85b76c;p=sdk%2Femulator%2Fqemu.git x86/cpuid: Convert remaining strdup() to g_strdup() Fixes missing error checking. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index edac377a02..352c390d0c 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -581,7 +581,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) unsigned int i; x86_def_t *def; - char *s = strdup(cpu_model); + char *s = g_strdup(cpu_model); char *featurestr, *name = strtok(s, ","); /* Features to be added*/ uint32_t plus_features = 0, plus_ext_features = 0; @@ -727,11 +727,11 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model) if (check_features_against_host(x86_cpu_def) && enforce_cpuid) goto error; } - free(s); + g_free(s); return 0; error: - free(s); + g_free(s); return -1; } @@ -950,7 +950,7 @@ static int cpudef_setfield(const char *name, const char *str, void *opaque) int err = 0; if (!strcmp(name, "name")) { - def->name = strdup(str); + def->name = g_strdup(str); } else if (!strcmp(name, "model_id")) { strncpy(def->model_id, str, sizeof (def->model_id)); } else if (!strcmp(name, "level")) {