From: Paul Fertser Date: Thu, 30 Jul 2015 08:55:43 +0000 (+0300) Subject: svf: flush the queue before reallocing memory X-Git-Tag: v0.10.0-rc1~453 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2dcf7bf77d09f139308281c223d8562b6420b448;p=openocd svf: flush the queue before reallocing memory During reallocation a new memory region might be allocated and the old one freed. If jtag queue is holding a pointer to the old memory, it will segfault during the execution. Avoid this by flushing the queue before a reallocation attempt is made. This should fix ticket #102. Change-Id: I737fc3f1ebf6d76413a475beb8bf20184fe0233f Reported-by: Alex Forencich Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2899 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- diff --git a/src/svf/svf.c b/src/svf/svf.c index cf0cfae5..15198d9b 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -216,6 +216,7 @@ static int svf_read_command_from_file(FILE *fd); static int svf_check_tdo(void); static int svf_add_check_para(uint8_t enabled, int buffer_offset, int bit_len); static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str); +static int svf_execute_tap(void); static FILE *svf_fd; static char *svf_read_line; @@ -277,6 +278,9 @@ static int svf_realloc_buffers(size_t len) { void *ptr; + if (svf_execute_tap() != ERROR_OK) + return ERROR_FAIL; + ptr = realloc(svf_tdi_buffer, len); if (!ptr) return ERROR_FAIL;