From 56d4a5954808a95257fb4693b3eacd036dfeccde Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Sun, 3 Nov 2013 22:05:26 +0400 Subject: [PATCH] jtag: fix support for really long scans MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When programming large FPGAs the generated SVF files might contain really long SDR scans. They won't fit in the 1MiB jtag scan page at all, so in this case the allocated page needs to be bigger. The current code was silently corrupting memory. One particular example was sent by Volter targetting XC3S4000. It has an SDR 11316992 bits long, that is 1414624 bytes. Change-Id: I39f18d7e0654f2dbdf37df58c837c9ec1fb2aa2a Reported-by: "Voltner, Jiří" Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/1792 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/commands.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/jtag/commands.c b/src/jtag/commands.c index 2997d0475d..5e06840a69 100644 --- a/src/jtag/commands.c +++ b/src/jtag/commands.c @@ -109,7 +109,9 @@ void *cmd_queue_alloc(size_t size) if (!*p_page) { *p_page = malloc(sizeof(struct cmd_queue_page)); (*p_page)->used = 0; - (*p_page)->address = malloc(CMD_QUEUE_PAGE_SIZE); + size_t alloc_size = (size < CMD_QUEUE_PAGE_SIZE) ? + CMD_QUEUE_PAGE_SIZE : size; + (*p_page)->address = malloc(alloc_size); (*p_page)->next = NULL; } -- 2.30.2