github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add additional file exists check to remove errors

Browse source
This commit is contained in:
Piotr Rzeszut 2024-12-26 01:25:54 +01:00
commit dd646a64a6
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
armsrc/appmain.c
View file

@ -441,22 +441,35 @@ static void SendStatus(uint32_t wait) {
#ifdef WITH_FLASH #ifdef WITH_FLASH
DbpString(_CYAN_("Flash memory dictionary loaded")); DbpString(_CYAN_("Flash memory dictionary loaded"));
uint32_t num = 0;
uint32_t num = size_in_spiffs(MF_KEYS_FILE) / MF_KEY_LENGTH; if (exists_in_spiffs(MF_KEYS_FILE)) {
num = size_in_spiffs(MF_KEYS_FILE) / MF_KEY_LENGTH;
} else {
num = 0;
}
if (num > 0) { if (num > 0) {
Dbprintf(" Mifare.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, MF_KEYS_FILE); Dbprintf(" Mifare.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, MF_KEYS_FILE);
} else { } else {
Dbprintf(" Mifare.................. "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, MF_KEYS_FILE); Dbprintf(" Mifare.................. "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, MF_KEYS_FILE);
} }
num = size_in_spiffs(T55XX_KEYS_FILE) / T55XX_KEY_LENGTH; if (exists_in_spiffs(T55XX_KEYS_FILE)) {
num = size_in_spiffs(T55XX_KEYS_FILE) / T55XX_KEY_LENGTH;
} else {
num = 0;
}
if (num > 0) { if (num > 0) {
Dbprintf(" T55xx................... "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, T55XX_KEYS_FILE); Dbprintf(" T55xx................... "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, T55XX_KEYS_FILE);
} else { } else {
Dbprintf(" T55xx................... "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, T55XX_KEYS_FILE); Dbprintf(" T55xx................... "_RED_("%u")" keys (spiffs: "_RED_("%s")")", num, T55XX_KEYS_FILE);
} }
num = size_in_spiffs(ICLASS_KEYS_FILE) / ICLASS_KEY_LENGTH; if (exists_in_spiffs(ICLASS_KEYS_FILE)) {
num = size_in_spiffs(ICLASS_KEYS_FILE) / ICLASS_KEY_LENGTH;
} else {
num = 0;
}
if (num > 0) { if (num > 0) {
Dbprintf(" iClass.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, ICLASS_KEYS_FILE); Dbprintf(" iClass.................. "_YELLOW_("%u")" keys (spiffs: "_GREEN_("%s")")", num, ICLASS_KEYS_FILE);
} else { } else {

8
armsrc/mifarecmd.c
View file

@ -1901,9 +1901,13 @@ void MifareChkKeys_fast(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *da
if (use_flashmem) { if (use_flashmem) {
BigBuf_free(); BigBuf_free();
uint32_t size = 0; uint32_t size = 0;
size = size_in_spiffs(MF_KEYS_FILE); if (exists_in_spiffs(MF_KEYS_FILE)) {
if (size <= 0) size = size_in_spiffs(MF_KEYS_FILE);
}
if (size == 0) {
Dbprintf("Spiffs file: %s does not exists or empty.", MF_KEYS_FILE);
goto OUT; goto OUT;
}
keyCount = size / MF_KEY_LENGTH; keyCount = size / MF_KEY_LENGTH;