X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fft2232.c;h=fed829856036d17c2eec0ef8f80a656b7dba1eb3;hp=9a40ed9a5f25e54a081777dd5a4c2b81d5b9ed1e;hb=46bcaec696ae0974b47aeaea876737f13d0c55e5;hpb=101c602b5eb67725495414da0016d15135644915

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 9a40ed9a5f..fed8298560 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -1061,7 +1061,8 @@ static void ft2232_add_scan(bool ir_scan, enum scan_type type, uint8_t *buffer,
 			/* LOG_DEBUG("added TDI bits (i %i)", bits_left - 1); */
 		}
 		buffer_write(0x0);
-		buffer_write(last_bit);
+		if (type != SCAN_IN)
+			buffer_write(last_bit);
 	} else {
 		int tms_bits;
 		int tms_count;
@@ -1107,6 +1108,11 @@ static int ft2232_large_scan(struct scan_command *cmd,
 	int retval;
 	int thisrun_read = 0;
 
+	if (!receive_buffer) {
+		LOG_ERROR("failed to allocate memory");
+		exit(-1);
+	}
+
 	if (cmd->ir_scan) {
 		LOG_ERROR("BUG: large IR scans are not supported");
 		exit(-1);
@@ -1272,6 +1278,8 @@ static int ft2232_large_scan(struct scan_command *cmd,
 			(int)bytes_read);
 	}
 
+	free(receive_buffer);
+
 	return ERROR_OK;
 }