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

Minor bounds checks for setDemodBuf and printDemodBuff

Browse source
This commit is contained in:
iceman1001 2015-01-29 21:44:24 +01:00
commit b6bf652821
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/cmddata.c
View file

@ -30,6 +30,12 @@ static int CmdHelp(const char *Cmd);
//by marshmellow //by marshmellow
void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx) void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
{ {
if (buff == NULL)
return;
if ( size >= MAX_DEMOD_BUF_LEN)
size = MAX_DEMOD_BUF_LEN;
size_t i = 0; size_t i = 0;
for (; i < size; i++){ for (; i < size; i++){
DemodBuffer[i]=buff[startIdx++]; DemodBuffer[i]=buff[startIdx++];
@ -56,6 +62,11 @@ void printDemodBuff()
return; return;
} }
if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
// equally divided by 16
if ( bitLen % 16 > 0)
bitLen = (bitlen/16);
for (i = 0; i <= (bitLen-16); i+=16) { for (i = 0; i <= (bitLen-16); i+=16) {
PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i", PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
DemodBuffer[i], DemodBuffer[i],