github/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-09 03:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix missing loaded counter

Browse Source
This commit is contained in:
iceman1001
2023-11-05 02:11:24 +01:00
parent 2ccf84f40a
commit a69eed7950
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/fileutils.c
View File

@@ -1223,12 +1223,13 @@ int loadFileNFC_safe(const char *preferredName, void *data, size_t maxdatalen, s
uint8_t block[MFBLOCK_SIZE] = {0};
param_gethex_to_eol(p, 0, block, MFBLOCK_SIZE, &n);
memcpy(&udata.bytes[(blockno * MFBLOCK_SIZE)], block, MFBLOCK_SIZE);
counter += MFBLOCK_SIZE;
} else if (ft == NFC_DF_PICOPASS) {
uint8_t block[PICOPASS_BLOCK_SIZE] = {0};
param_gethex_to_eol(p, 0, block, PICOPASS_BLOCK_SIZE, &n);
memcpy(&udata.bytes[(blockno * PICOPASS_BLOCK_SIZE)], block, PICOPASS_BLOCK_SIZE);
counter += PICOPASS_BLOCK_SIZE;
}
counter += PICOPASS_BLOCK_SIZE;
continue;
}
}

2
client/src/util.c
View File

@@ -1200,7 +1200,7 @@ char *str_ndup(const char *src, size_t len) {
size_t str_nlen(const char *src, size_t maxlen) {
size_t len = 0;
if(src {
if(src) {
for(char c = *src; (len < maxlen && c != '\0'); c = *++src) {
len++;
}