[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/18] libcacard: Fix unchecked strdup() by converti
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 13/18] libcacard: Fix unchecked strdup() by converting to g_strdup() |
Date: |
Wed, 30 Jan 2013 11:24:25 +0100 |
From: Markus Armbruster <address@hidden>
Note that we already free with g_free().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
libcacard/vcard_emul_nss.c | 4 ++--
libcacard/vreader.c | 2 +-
libcacard/vscclient.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c
index 5f565e0..df79476 100644
--- a/libcacard/vcard_emul_nss.c
+++ b/libcacard/vcard_emul_nss.c
@@ -454,7 +454,7 @@ vreader_emul_new(PK11SlotInfo *slot, VCardEmulType type,
const char *params)
new_reader_emul->slot = PK11_ReferenceSlot(slot);
new_reader_emul->default_type = type;
- new_reader_emul->type_params = strdup(params);
+ new_reader_emul->type_params = g_strdup(params);
new_reader_emul->present = PR_FALSE;
new_reader_emul->series = 0;
new_reader_emul->saved_vcard = NULL;
@@ -997,7 +997,7 @@ vcard_emul_init(const VCardEmulOptions *options)
/* We should control this with options. For now we mirror out any
* removable hardware slot */
default_card_type = options->hw_card_type;
- default_type_params = strdup(options->hw_type_params);
+ default_type_params = g_strdup(options->hw_type_params);
SECMOD_GetReadLock(module_lock);
for (mlp = module_list; mlp; mlp = mlp->next) {
diff --git a/libcacard/vreader.c b/libcacard/vreader.c
index 313349b..f3efc27 100644
--- a/libcacard/vreader.c
+++ b/libcacard/vreader.c
@@ -49,7 +49,7 @@ vreader_new(const char *name, VReaderEmul *private,
reader = (VReader *)g_malloc(sizeof(VReader));
qemu_mutex_init(&reader->lock);
reader->reference_count = 1;
- reader->name = name ? strdup(name) : NULL;
+ reader->name = g_strdup(name);
reader->card = NULL;
reader->id = (vreader_id_t)-1;
reader->reader_private = private;
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index 2fce52b..9b744f2 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -503,8 +503,8 @@ main(
command_line_options = vcard_emul_options(emul_args);
}
- qemu_host = strdup(argv[argc - 2]);
- qemu_port = strdup(argv[argc - 1]);
+ qemu_host = g_strdup(argv[argc - 2]);
+ qemu_port = g_strdup(argv[argc - 1]);
sock = connect_to_qemu(qemu_host, qemu_port);
if (sock == -1) {
fprintf(stderr, "error opening socket, exiting.\n");
--
1.8.1
- [Qemu-devel] [PATCH 2/4] acpitable: open the data file in binary mode, (continued)
- [Qemu-devel] [PATCH 2/4] acpitable: open the data file in binary mode, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 03/18] cadence_gem: Debug mode compile fixes, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 02/18] cadence_ttc: Debug mode compile fixes, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 4/4] hw/tpci200: Fix compiler warning (redefined symbol with MinGW), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 3/4] configure: silence pkg-config's check for curses, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 04/18] xilinx_axidma: Fix debug mode compile messages, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 05/18] g_malloc(0) and g_malloc0(0) return NULL; simplify, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 10/18] virtfs-proxy-helper: Fix unchecked strdup() by conv. to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 09/18] spice: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 15/18] qemu-ga: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 13/18] libcacard: Fix unchecked strdup() by converting to g_strdup(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 14/18] qapi: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 16/18] qemu-pixman.h: Avoid mutual inclusion loop with console.h, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 18/18] qmp-commands.hx: s/tray-open/tray_open/ to match qapi schema, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 06/18] g_strdup(NULL) returns NULL; simplify, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 08/18] readline: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 17/18] tests: Fix {rtc, m48t59}-test build on illumos, Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 07/18] hw/9pfs: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 11/18] qemu-log: Fix unchecked strdup() by converting to g_strdup(), Stefan Hajnoczi, 2013/01/30
- [Qemu-devel] [PATCH 12/18] qemu-log: Plug trivial memory leak in cpu_set_log_filename(), Stefan Hajnoczi, 2013/01/30