From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org
Subject: [Qemu-devel] [PATCH 1/3] x86/cpuid: Convert remaining strdup() to g_strdup()
Date: Tue, 8 Nov 2011 15:36:48 +0100 [thread overview]
Message-ID: <1320763010-10024-2-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1320763010-10024-1-git-send-email-armbru@redhat.com>
Fixes missing error checking.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
target-i386/cpuid.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 1e8bcff..7c8f1be 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -600,7 +600,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;
@@ -746,11 +746,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;
}
@@ -969,7 +969,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")) {
--
1.7.6.4
next prev parent reply other threads:[~2011-11-08 14:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-08 14:36 [Qemu-devel] [PATCH 0/3] x86/cpuid: A few trivial fixes Markus Armbruster
2011-11-08 14:36 ` Markus Armbruster [this message]
2011-11-08 14:36 ` [Qemu-devel] [PATCH 2/3] x86/cpuid: Plug memory leak in cpudef_setfield() Markus Armbruster
2011-11-08 14:36 ` [Qemu-devel] [PATCH 3/3] x86/cpuid: Fix crash on -cpu "" Markus Armbruster
2011-11-09 10:13 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/3] x86/cpuid: A few trivial fixes Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320763010-10024-2-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).