[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/7] libcacard/vreader: Drop broken recovery from
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 3/7] libcacard/vreader: Drop broken recovery from failed assertion |
Date: |
Fri, 23 May 2014 13:24:35 +0200 |
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 <address@hidden>
Reviewed-by: Alon Levy <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/7] libcacard: A few simple fixes and cleanups, Markus Armbruster, 2014/05/23
- [Qemu-devel] [PATCH v2 2/7] libcacard: Plug memory leaks around vreader_get_reader_list(), Markus Armbruster, 2014/05/23
- [Qemu-devel] [PATCH v2 3/7] libcacard/vreader: Drop broken recovery from failed assertion,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 7/7] libcacard/vcard_emul_nss: Drop a redundant conditional, Markus Armbruster, 2014/05/23
- [Qemu-devel] [PATCH v2 1/7] libcacard/vscclient: Bury some dead code, Markus Armbruster, 2014/05/23
- [Qemu-devel] [PATCH v2 4/7] libcacard/vreader: Tighten assertion to clarify intent, Markus Armbruster, 2014/05/23
- Re: [Qemu-devel] [PATCH v2 0/7] libcacard: A few simple fixes and cleanups, Michael Tokarev, 2014/05/23