From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnnam-00037x-Cl for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wnnad-0000bg-Sa for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42690) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnnad-0000bD-Ip for qemu-devel@nongnu.org; Fri, 23 May 2014 07:24:43 -0400 From: Markus Armbruster Date: Fri, 23 May 2014 13:24:35 +0200 Message-Id: <1400844279-1685-4-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 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: mjt@tls.msk.ru, 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 Reviewed-by: Alon Levy --- 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