calloc and check. remove add char.

This commit is contained in:
iceman1001 committed 2021-10-10 14:26:00 +02:00
1 parent 2d38d721a3
commit 1ab9d24b5c
2 files changed
+9 -4

No files matched your search

+8 -3
View File
@@ -20,22 +20,27 @@ const char *getAtrInfo(const char *atr_str) {
int match = -1;
// skip last element of AtrTable
for (int i = 0; i < ARRAYLEN(AtrTable) - 1; ++i) {
if (strlen(AtrTable[i].bytes) != slen)
continue;
if (strstr(AtrTable[i].bytes, "..") != NULL) {
char *tmp_atr = malloc(slen);
if (!tmp_atr) {
PrintAndLogEx(ERR, "Out of memory error in getAtrInfo(). Aborting...");
char *tmp_atr = calloc(slen, sizeof(uint8_t));
if (tmp_atr == NULL) {
PrintAndLogEx(FAILED, "failed to allocate memory");
return NULL;
}
for (int j = 0; j < slen; j++) {
tmp_atr[j] = AtrTable[i].bytes[j]=='.' ? '.' : atr_str[j];
}
if (strncmp(tmp_atr, AtrTable[i].bytes, slen) == 0) {
// record partial match but continue looking for full match
match = i;
}
free(tmp_atr);
} else {
if (strncmp(atr_str, AtrTable[i].bytes, slen) == 0) return AtrTable[i].desc;
}