BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial-dmm: print data bytes according to specific meter's packet length 

The previous implementation always dumped 23 data bytes for received
packets. This could result in truncated diagnostics information, and/or
access to invalid buffer content.

Rephrase the packet dump routine such that the specific meter's exact
packet length gets dumped, and use the common hex dump support code.
This commit is contained in:
Gerhard Sittig 2018-09-29 20:46:45 +02:00 committed by Uwe Hermann
parent f1d0755b73
commit 75aaf967e3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hardware/serial-dmm/protocol.c
View File

@ -27,15 +27,13 @@
#include "libsigrok-internal.h" #include "libsigrok-internal.h"
#include "protocol.h" #include "protocol.h"
static void log_dmm_packet(const uint8_t *buf) static void log_dmm_packet(const uint8_t *buf, size_t len)
{ {
sr_dbg("DMM packet: %02x %02x %02x %02x %02x %02x %02x " GString *text;
"%02x %02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x", text = sr_hexdump_new(buf, len);
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], sr_dbg("DMM packet: %s", text->str);
buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], sr_hexdump_free(text);
buf[14], buf[15], buf[16], buf[17], buf[18], buf[19], buf[20],
buf[21], buf[22]);
} }
static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
@ -55,7 +53,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
dmm = (struct dmm_info *)sdi->driver; dmm = (struct dmm_info *)sdi->driver;
log_dmm_packet(buf); log_dmm_packet(buf, dmm->packet_size);
devc = sdi->priv; devc = sdi->priv;
sent_sample = FALSE; sent_sample = FALSE;