From: Lars-Peter Clausen <redacted>
Date: Thu, 21 Jun 2012 08:30:39 +0000 (+0200)
Subject: sr: fx2lafw: Fix memory leaks in receive_transfer
X-Git-Tag: dsupstream~905
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=eabf24035b29020085f01dd6e5a2f3c7075db23e;p=libsigrok.git

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 <redacted>
---

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index aa8331f1..6b184b70 100644
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -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)