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

FIX: two coverty scan bugs.

Browse source
This commit is contained in:
Chris 2018-08-18 15:22:59 +02:00
commit 854bfc8595
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
common/i2c.c
View file

@ -442,7 +442,7 @@ int16_t I2C_BufferRead(uint8_t *data, uint8_t len, uint8_t device_cmd, uint8_t d
I2C_Stop(); I2C_Stop();
// return bytecount - first byte (which is length byte) // return bytecount - first byte (which is length byte)
return (readcount) ? --readcount : 0; return --readcount;
} }
int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) { int16_t I2C_ReadFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t device_address) {
@ -595,11 +595,12 @@ bool sc_rx_bytes(uint8_t* dest, uint8_t *destlen) {
bool GetATR(smart_card_atr_t *card_ptr) { bool GetATR(smart_card_atr_t *card_ptr) {
// clear if ( !card_ptr )
if ( card_ptr ) { return false;
card_ptr->atr_len = 0;
memset(card_ptr->atr, 0, sizeof(card_ptr->atr)); card_ptr->atr_len = 0;
} memset(card_ptr->atr, 0, sizeof(card_ptr->atr));
// Send ATR // Send ATR
// start [C0 01] stop start C1 len aa bb cc stop] // start [C0 01] stop start C1 len aa bb cc stop]
@ -639,10 +640,8 @@ bool GetATR(smart_card_atr_t *card_ptr) {
} }
} }
if ( card_ptr ) { card_ptr->atr_len = len;
card_ptr->atr_len = len; LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false);
LogTrace(card_ptr->atr, card_ptr->atr_len, 0, 0, NULL, false);
}
return true; return true;
} }