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

sr: fx2lafw: Fix memory leaks in receive_transfer 

There are a few memory leaks in the receive_transfer transfer function. The most
serve of them is that a sample buffer is not freed if the triggered has not
matched yet, which causes a sigrok process which is waiting for a trigger to
consume several megabytes of memory within seconds. The other leaks are on the
error paths in that function.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2012-06-21 10:30:39 +02:00 committed by Uwe Hermann
parent 9edfee3ee3
commit eabf24035b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/fx2lafw/fx2lafw.c
View File

@ -706,6 +706,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
/* Fire off a new request. */
if (!(new_buf = g_try_malloc(4096))) {
sr_err("fx2lafw: %s: new_buf malloc failed.", __func__);
libusb_free_transfer(transfer);
return; /* TODO: SR_ERR_MALLOC */
}
@ -726,6 +727,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
*/
abort_acquisition(ctx);
}
g_free(cur_buf);
return;
} else {
empty_transfer_count = 0;
@ -801,7 +803,6 @@ static void receive_transfer(struct libusb_transfer *transfer)
logic.unitsize = sample_width;
logic.data = cur_buf + trigger_offset_bytes;
sr_session_send(ctx->session_dev_id, &packet);
g_free(cur_buf);
ctx->num_samples += cur_sample_count;
if (ctx->limit_samples &&
@ -814,6 +815,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
* ratio-sized buffer.
*/
}
g_free(cur_buf);
}
static int hw_dev_acquisition_start(int dev_index, void *cb_data)