dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coverity fix 226278 and offset computation as side effect

Browse Source
This commit is contained in:
Philippe Teuwen
2020-04-29 19:19:26 +02:00
parent 250418f64b
commit 155d30ce49
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
armsrc/appmain.c
View File

@@ -1642,7 +1642,7 @@ static void PacketReceived(PacketCommandNG *packet) {
struct p { struct p {
uint8_t flag; uint8_t flag;
uint16_t offset; uint16_t offset;
uint8_t *data; uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint8_t) - sizeof(uint16_t)];
} PACKED; } PACKED;
struct p *payload = (struct p *)packet->data.asBytes; struct p *payload = (struct p *)packet->data.asBytes;
@@ -1654,11 +1654,11 @@ static void PacketReceived(PacketCommandNG *packet) {
} }
// 40 000 - (512-3) 509 = 39491 // 40 000 - (512-3) 509 = 39491
uint16_t offset = MIN(BIGBUF_SIZE - PM3_CMD_DATA_SIZE - 3, payload->offset); uint16_t offset = MIN(BIGBUF_SIZE - sizeof(payload->data), payload->offset);
// need to copy len bytes of data, not PM3_CMD_DATA_SIZE - 3 - offset // need to copy len bytes of data, not PM3_CMD_DATA_SIZE - 3 - offset
// ensure len bytes copied wont go past end of bigbuf // ensure len bytes copied wont go past end of bigbuf
uint16_t len = MIN(BIGBUF_SIZE - offset, PM3_CMD_DATA_SIZE - 3); uint16_t len = MIN(BIGBUF_SIZE - offset, sizeof(payload->data));
uint8_t *mem = BigBuf_get_addr(); uint8_t *mem = BigBuf_get_addr();