From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnnam-00037w-Co for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wnnaf-0000cd-Mh for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnnaf-0000cN-Cp for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:45 -0400 From: Markus Armbruster Date: Fri, 23 May 2014 13:24:37 +0200 Message-Id: <1400844279-1685-6-git-send-email-armbru@redhat.com> In-Reply-To: <1400844279-1685-1-git-send-email-armbru@redhat.com> References: <1400844279-1685-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 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: mjt@tls.msk.ru, alevy@redhat.com Signed-off-by: Markus Armbruster Reviewed-by: Alon Levy --- libcacard/cac.c | 13 ++----------- libcacard/vcard_emul_nss.c | 7 ++----- 2 files changed, 4 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..2048917 100644 --- a/libcacard/vcard_emul_nss.c +++ b/libcacard/vcard_emul_nss.c @@ -1178,11 +1178,8 @@ 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_renew(VirtualReaderOptions, opts->vreader, + reader_count); } opts->vreader = vreaderOpt; vreaderOpt = &vreaderOpt[opts->vreader_count]; -- 1.9.0