From patchwork Tue Jan 22 10:08:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 214520 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F19752C007C for ; Tue, 22 Jan 2013 22:40:44 +1100 (EST) Received: from localhost ([::1]:59184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txamk-0008NJ-RQ for incoming@patchwork.ozlabs.org; Tue, 22 Jan 2013 05:08:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxamA-0007pi-Fc for qemu-devel@nongnu.org; Tue, 22 Jan 2013 05:08:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Txam7-0000CL-Ay for qemu-devel@nongnu.org; Tue, 22 Jan 2013 05:08:18 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:48336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txam7-0000BZ-2f; Tue, 22 Jan 2013 05:08:15 -0500 Received: from blackfin.pond.sub.org (p5B329A82.dip.t-dialin.net [91.50.154.130]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 98748A3E6F; Tue, 22 Jan 2013 11:08:10 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A151E200B1; Tue, 22 Jan 2013 11:08:07 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 22 Jan 2013 11:08:04 +0100 Message-Id: <1358849286-24750-10-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358849286-24750-1-git-send-email-armbru@redhat.com> References: <1358849286-24750-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: qemu-trivial@nongnu.org Subject: [Qemu-devel] [PATCH v3 09/11] libcacard: Fix unchecked strdup() by converting to g_strdup() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Note that we already free with g_free(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- 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");