From 0fe3a5a471bafc4511ebb03d49375377be2cbc2f Mon Sep 17 00:00:00 2001 From: nat Date: Thu, 11 Jan 2024 06:09:14 -0800 Subject: [PATCH] aimeio-pcsc: soft error for some edge cases --- aimeio/aimeio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/aimeio/aimeio.c b/aimeio/aimeio.c index f876d12..eaa04f8 100644 --- a/aimeio/aimeio.c +++ b/aimeio/aimeio.c @@ -78,12 +78,10 @@ HRESULT aime_io_nfc_get_aime_id( { assert(luid != NULL); - if (unit_no != 0 || data.card_type != Mifare) { + if (unit_no != 0 || data.card_type != Mifare || luid_size != data.card_id_len) { return S_FALSE; } - assert(luid_size == data.card_id_len); - memcpy(luid, data.card_id, luid_size); return S_OK; @@ -96,7 +94,7 @@ HRESULT aime_io_nfc_get_felica_id(uint8_t unit_no, uint64_t *IDm) assert(IDm != NULL); - if (unit_no != 0 || data.card_type != FeliCa) { + if (unit_no != 0 || data.card_type != FeliCa || data.card_id_len != 8) { return S_FALSE; }