From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUR5-0000DM-EI for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnUQy-0003L9-L0 for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUQy-0003L3-CJ for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:28 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4MEvRqE002116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 22 May 2014 10:57:27 -0400 From: Markus Armbruster Date: Thu, 22 May 2014 16:57:20 +0200 Message-Id: <1400770642-18196-6-git-send-email-armbru@redhat.com> In-Reply-To: <1400770642-18196-1-git-send-email-armbru@redhat.com> References: <1400770642-18196-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 5/7] libcacard: Convert two leftover realloc() to GLib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alevy@redhat.com Signed-off-by: Markus Armbruster --- libcacard/cac.c | 13 ++----------- libcacard/vcard_emul_nss.c | 6 +----- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/libcacard/cac.c b/libcacard/cac.c index 74ef3e3..05ce8a2 100644 --- a/libcacard/cac.c +++ b/libcacard/cac.c @@ -169,17 +169,8 @@ cac_applet_pki_process_apdu(VCard *card, VCardAPDU *apdu, } size = apdu->a_Lc; - sign_buffer = realloc(pki_applet->sign_buffer, - pki_applet->sign_buffer_len+size); - if (sign_buffer == NULL) { - g_free(pki_applet->sign_buffer); - pki_applet->sign_buffer = NULL; - pki_applet->sign_buffer_len = 0; - *response = vcard_make_response( - VCARD7816_STATUS_EXC_ERROR_MEMORY_FAILURE); - ret = VCARD_DONE; - break; - } + sign_buffer = g_realloc(pki_applet->sign_buffer, + pki_applet->sign_buffer_len + size); memcpy(sign_buffer+pki_applet->sign_buffer_len, apdu->a_body, size); size += pki_applet->sign_buffer_len; switch (apdu->a_p1) { diff --git a/libcacard/vcard_emul_nss.c b/libcacard/vcard_emul_nss.c index 692534c..f98541f 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -1178,11 +1178,7 @@ vcard_emul_options(const char *args) if (opts->vreader_count >= reader_count) { reader_count += READER_STEP; - vreaderOpt = realloc(opts->vreader, - reader_count * sizeof(*vreaderOpt)); - if (vreaderOpt == NULL) { - return opts; /* we're done */ - } + vreaderOpt = g_new(VirtualReaderOptions, reader_count); } opts->vreader = vreaderOpt; vreaderOpt = &vreaderOpt[opts->vreader_count]; -- 1.9.0