ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86/cpuid: Convert remaining strdup() to g_strdup() 

Fixes missing error checking.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
This commit is contained in:
Markus Armbruster 2011-11-08 15:36:48 +01:00 committed by Stefan Hajnoczi
parent 302d9d6fd8
commit d3c481b357
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-i386/cpuid.c
View File

@ -581,7 +581,7 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
unsigned int i; unsigned int i;
x86_def_t *def; x86_def_t *def;
char *s = strdup(cpu_model); char *s = g_strdup(cpu_model);
char *featurestr, *name = strtok(s, ","); char *featurestr, *name = strtok(s, ",");
/* Features to be added*/ /* Features to be added*/
uint32_t plus_features = 0, plus_ext_features = 0; 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) if (check_features_against_host(x86_cpu_def) && enforce_cpuid)
goto error; goto error;
} }
free(s); g_free(s);
return 0; return 0;
error: error:
free(s); g_free(s);
return -1; return -1;
} }
@ -950,7 +950,7 @@ static int cpudef_setfield(const char *name, const char *str, void *opaque)
int err = 0; int err = 0;
if (!strcmp(name, "name")) { if (!strcmp(name, "name")) {
def->name = strdup(str); def->name = g_strdup(str);
} else if (!strcmp(name, "model_id")) { } else if (!strcmp(name, "model_id")) {
strncpy(def->model_id, str, sizeof (def->model_id)); strncpy(def->model_id, str, sizeof (def->model_id));
} else if (!strcmp(name, "level")) { } else if (!strcmp(name, "level")) {