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 4

fix overflow (@wh201906)

Browse source
This commit is contained in:
iceman1001 2023-11-06 17:12:03 +01:00
commit bf6f5518ac
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
armsrc/appmain.c
View file

@ -369,7 +369,7 @@ static void print_debug_level(void) {
// measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time. // measure the Connection Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included. // Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the PacketCommandNG structure included.
static void printConnSpeed(uint32_t testTimeout) { static void printConnSpeed(uint32_t wait) {
DbpString(_CYAN_("Transfer Speed")); DbpString(_CYAN_("Transfer Speed"));
Dbprintf(" Sending packets to client..."); Dbprintf(" Sending packets to client...");
@ -380,7 +380,7 @@ static void printConnSpeed(uint32_t testTimeout) {
LED_B_ON(); LED_B_ON();
while (delta_time < testTimeout) { while (delta_time < wait) {
reply_ng(CMD_DOWNLOADED_BIGBUF, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE); reply_ng(CMD_DOWNLOADED_BIGBUF, PM3_SUCCESS, test_data, PM3_CMD_DATA_SIZE);
bytes_transferred += PM3_CMD_DATA_SIZE; bytes_transferred += PM3_CMD_DATA_SIZE;
delta_time = GetTickCountDelta(start_time); delta_time = GetTickCountDelta(start_time);
@ -389,13 +389,13 @@ static void printConnSpeed(uint32_t testTimeout) {
Dbprintf(" Time elapsed................... %dms", delta_time); Dbprintf(" Time elapsed................... %dms", delta_time);
Dbprintf(" Bytes transferred.............. %d", bytes_transferred); Dbprintf(" Bytes transferred.............. %d", bytes_transferred);
Dbprintf(" Transfer Speed PM3 -> Client... " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time); Dbprintf(" Transfer Speed PM3 -> Client... " _YELLOW_("%llu") " bytes/s", 1000 * (uint64_t)bytes_transferred / delta_time);
} }
/** /**
* Prints runtime information about the PM3. * Prints runtime information about the PM3.
**/ **/
static void SendStatus(int32_t speedTestTimeout) { static void SendStatus(uint32_t wait) {
BigBuf_print_status(); BigBuf_print_status();
Fpga_print_status(); Fpga_print_status();
#ifdef WITH_FLASH #ifdef WITH_FLASH
@ -411,7 +411,7 @@ static void SendStatus(int32_t speedTestTimeout) {
#ifdef WITH_ISO14443a #ifdef WITH_ISO14443a
printHf14aConfig(); // HF 14a config printHf14aConfig(); // HF 14a config
#endif #endif
printConnSpeed(speedTestTimeout); printConnSpeed(wait);
DbpString(_CYAN_("Various")); DbpString(_CYAN_("Various"));
print_stack_usage(); print_stack_usage();