libcacard/vreader: Drop broken recovery from failed assertion
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 <armbru@redhat.com> Reviewed-by: Alon Levy <alevy@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
124fe7fb1b
commit
fa5912a17b
|
@ -284,11 +284,9 @@ vreader_xfr_bytes(VReader *reader,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assert(card_status == VCARD_DONE);
|
assert(card_status == VCARD_DONE);
|
||||||
if (card_status == VCARD_DONE) {
|
int size = MIN(*receive_buf_len, response->b_total_len);
|
||||||
int size = MIN(*receive_buf_len, response->b_total_len);
|
memcpy(receive_buf, response->b_data, size);
|
||||||
memcpy(receive_buf, response->b_data, size);
|
*receive_buf_len = size;
|
||||||
*receive_buf_len = size;
|
|
||||||
}
|
|
||||||
vcard_response_delete(response);
|
vcard_response_delete(response);
|
||||||
vcard_apdu_delete(apdu);
|
vcard_apdu_delete(apdu);
|
||||||
vcard_free(card); /* free our reference */
|
vcard_free(card); /* free our reference */
|
||||||
|
|
Loading…
Reference in a new issue