From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>,
Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 5/8] x86/cpuid: Convert remaining strdup() to g_strdup()
Date: Thu, 10 Nov 2011 12:36:41 +0000 [thread overview]
Message-ID: <1320928604-6642-6-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1320928604-6642-1-git-send-email-stefanha@linux.vnet.ibm.com>
From: Markus Armbruster <armbru@redhat.com>
Fixes missing error checking.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.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 edac377..352c390 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")) {
--
1.7.7.1
next prev parent reply other threads:[~2011-11-10 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 12:36 [Qemu-devel] [PULL 0/8] Trivial patches for 8 to 10 November 2011 Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 1/8] qemu-tech.texi: Update default code cache size Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 2/8] configure: Show --cpu option on the help list Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 3/8] qdev: Fix crash on -device '?=x' Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 4/8] ui/vnc: Convert sasl.mechlist to g_malloc() & friends Stefan Hajnoczi
2011-11-10 12:36 ` Stefan Hajnoczi [this message]
2011-11-10 12:36 ` [Qemu-devel] [PATCH 6/8] x86/cpuid: Plug memory leak in cpudef_setfield() Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 7/8] x86/cpuid: Fix crash on -cpu "" Stefan Hajnoczi
2011-11-10 12:36 ` [Qemu-devel] [PATCH 8/8] hw/lan9118.c: Add missing 'break' to fix buffer overrun Stefan Hajnoczi
2011-11-10 20:06 ` [Qemu-devel] [PULL 0/8] Trivial patches for 8 to 10 November 2011 Anthony Liguori
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=1320928604-6642-6-git-send-email-stefanha@linux.vnet.ibm.com \
--to=stefanha@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@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).