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

rigol-ds: fix use-after-free 

This amends commit 4fad41a8a4 which fixed a leak but introduced the
use after free.
This commit is contained in:
Ralf 2021-06-07 07:08:06 +02:00 committed by Gerhard Sittig
parent ed78768225
commit 73c575cf9e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hardware/rigol-ds/protocol.c
View File

@ -267,7 +267,7 @@ static int rigol_ds_check_stop(const struct sr_dev_inst *sdi)
/* Wait for enough data becoming available in scope output buffer */ /* Wait for enough data becoming available in scope output buffer */
static int rigol_ds_block_wait(const struct sr_dev_inst *sdi) static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
{ {
char *buf; char *buf, c;
struct dev_context *devc; struct dev_context *devc;
time_t start; time_t start;
int len, ret; int len, ret;
@ -297,10 +297,11 @@ static int rigol_ds_block_wait(const struct sr_dev_inst *sdi)
if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK) if (sr_scpi_get_string(sdi->conn, ":WAV:STAT?", &buf) != SR_OK)
return SR_ERR; return SR_ERR;
ret = parse_int(buf + 5, &len); ret = parse_int(buf + 5, &len);
c = buf[0];
g_free(buf); g_free(buf);
if (ret != SR_OK) if (ret != SR_OK)
return SR_ERR; return SR_ERR;
} while (buf[0] == 'R' && len < (1000 * 1000)); } while (c == 'R' && len < (1000 * 1000));
} }
rigol_ds_set_wait_event(devc, WAIT_NONE); rigol_ds_set_wait_event(devc, WAIT_NONE);