From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUR6-0000Dl-Lm 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 1WnUQx-0003Ke-5s for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnUQw-0003KH-UX for qemu-devel@nongnu.org; Thu, 22 May 2014 10:57:27 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4MEvPR3026599 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 22 May 2014 10:57:25 -0400 From: Markus Armbruster Date: Thu, 22 May 2014 16:57:18 +0200 Message-Id: <1400770642-18196-4-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 3/7] libcacard/vreader: Drop broken recovery from failed assertion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alevy@redhat.com We suppress some code when we got unexpected status and assertion checking is off: assert(card_status == VCARD_DONE); if (card_status == VCARD_DONE) { int size = MIN(*receive_buf_len, response->b_total_len); memcpy(receive_buf, response->b_data, size); *receive_buf_len = size; } Such "recovery" is of dubious value even when it works. This one doesn't: it fails to assign to receive_buf[] and *receive_buf_len, which the callers expect. Make the code unconditional. Signed-off-by: Markus Armbruster --- libcacard/vreader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libcacard/vreader.c b/libcacard/vreader.c index 7720295..c966bb3 100644 --- a/libcacard/vreader.c +++ b/libcacard/vreader.c @@ -284,11 +284,9 @@ vreader_xfr_bytes(VReader *reader, } } assert(card_status == VCARD_DONE); - if (card_status == VCARD_DONE) { - int size = MIN(*receive_buf_len, response->b_total_len); - memcpy(receive_buf, response->b_data, size); - *receive_buf_len = size; - } + int size = MIN(*receive_buf_len, response->b_total_len); + memcpy(receive_buf, response->b_data, size); + *receive_buf_len = size; vcard_response_delete(response); vcard_apdu_delete(apdu); vcard_free(card); /* free our reference */ -- 1.9.0