RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-10 02:04:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #19 from alexgrin/iceman_master

Browse source 
Another Coverity fix
This commit is contained in:
Iceman 2016-08-03 08:00:22 +02:00 committed by GitHub
commit 45c48ae428
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/cmdhflegic.c
View file

@ -579,7 +579,10 @@ int CmdLegicCalcCrc8(const char *Cmd){
// peek at length of the input string so we can // peek at length of the input string so we can
// figure out how many elements to malloc in "data" // figure out how many elements to malloc in "data"
bg=en=0; bg=en=0;
param_getptr(Cmd, &bg, &en, cmdp+1); if (param_getptr(Cmd, &bg, &en, cmdp+1)) {
errors = true;
break;
}
len = (en - bg + 1); len = (en - bg + 1);
// check that user entered even number of characters // check that user entered even number of characters
@ -599,7 +602,10 @@ int CmdLegicCalcCrc8(const char *Cmd){
break; break;
} }
param_gethex(Cmd, cmdp+1, data, len); if (param_gethex(Cmd, cmdp+1, data, len)) {
errors = true;
break;
}
len >>= 1; len >>= 1;
cmdp += 2; cmdp += 2;

4
client/util.c
View file

@ -221,7 +221,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
// hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
// up to 64 bytes or 512 bits // up to 64 bytes or 512 bits
uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
uint8_t buf[64]; static uint8_t buf[64];
memset(buf, 0x00, 64); memset(buf, 0x00, 64);
uint8_t *tmp = buf; uint8_t *tmp = buf;
for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){ for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
@ -229,7 +229,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)]; tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
} }
} }
return tmp; return buf;
} }
// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64),