interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remote_bitbang: fix assertion failure for the cases when connection is abruptly terminated 

Changes affect the function remote_bitbang_fill_buf.
When read_socket returns 0, socket reached EOF and there is
no data to read. But if request was blocking, the caller
expected some data. Such situations should be treated as ERROR.

Change-Id: I02ed484e61fb776c1625f6e36ab14c85891939b2
Signed-off-by: Timur Golubovich <timur.golubovich@syntacore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8325
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Timur Golubovich 2024-06-07 16:42:16 +03:00 committed by Antonio Borneo
parent dde096e03f
commit 23ba602ca5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jtag/drivers/remote_bitbang.c
View File

@ -114,12 +114,18 @@ static int remote_bitbang_fill_buf(enum block_bool block)
contiguous_available_space);
if (first && block == BLOCK)
socket_nonblock(remote_bitbang_fd);
first = false;
if (count > 0) {
remote_bitbang_recv_buf_end += count;
if (remote_bitbang_recv_buf_end == sizeof(remote_bitbang_recv_buf))
remote_bitbang_recv_buf_end = 0;
} else if (count == 0) {
/* When read_socket returns 0, socket reached EOF and there is
* no data to read. But if request was blocking, the caller
* expected some data. Such situations should be treated as ERROR. */
if (first && block == BLOCK) {
LOG_ERROR("remote_bitbang: socket closed by remote");
return ERROR_FAIL;
}
return ERROR_OK;
} else if (count < 0) {
#ifdef _WIN32
@ -133,6 +139,7 @@ static int remote_bitbang_fill_buf(enum block_bool block)
return ERROR_FAIL;
}
}
first = false;
}
return ERROR_OK;