From 2b50ccbef81649f6c94be33ddb2058624480e76c Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Wed, 9 Oct 2019 13:00:22 +0200 Subject: [PATCH] coverity 226404 - fix ignoring number.. --- client/amiitool/amiibo.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/client/amiitool/amiibo.c b/client/amiitool/amiibo.c index d8fe837b1..36b9ae967 100644 --- a/client/amiitool/amiibo.c +++ b/client/amiitool/amiibo.c @@ -137,16 +137,15 @@ bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys *amiiboKeys, const char *path) { return false; } - if (!fread(amiiboKeys, sizeof(*amiiboKeys), 1, f)) { - fclose(f); - return false; - } + size_t len = fread(amiiboKeys, sizeof(*amiiboKeys), 1, f); fclose(f); - if ( - (amiiboKeys->data.magicBytesSize > 16) || - (amiiboKeys->tag.magicBytesSize > 16) - ) { + if (len != sizeof(*amiiboKeys)) { + return false; + } + + if ((amiiboKeys->data.magicBytesSize > 16) || + (amiiboKeys->tag.magicBytesSize > 16)) { return false; }