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

fix out-of-bounds access

Browse source
This commit is contained in:
iceman1001 2021-06-20 07:49:41 +02:00
commit 2f432788cf
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/src/cmdhfmfdes.c
View file

@ -2445,7 +2445,7 @@ static int CmdHF14ADesGetUID(const char *Cmd) {
uint8_t uidlen = 16; uint8_t uidlen = 16;
// Get datalen <uid len> + <crclen> by removing padding. // Get datalen <uid len> + <crclen> by removing padding.
while ((uidlen > 0) && (uid[uidlen] == 0x00)) while ((uidlen > 0) && (uid[uidlen - 1] == 0x00))
uidlen--; uidlen--;
if (tag->authentication_scheme == AS_LEGACY) if (tag->authentication_scheme == AS_LEGACY)
@ -2455,10 +2455,9 @@ static int CmdHF14ADesGetUID(const char *Cmd) {
if (uidlen <= 4) // < incase we trimmed a CRC 00 or more if (uidlen <= 4) // < incase we trimmed a CRC 00 or more
uidlen = 4; uidlen = 4;
else else
uidlen = 7; uidlen = 7;
// PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), sprint_hex(uid, sizeof(uid)));
PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), sprint_hex(uid, uidlen)); PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), sprint_hex(uid, uidlen));
return res; return res;
} }