[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-629-g23ba602ca

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  23ba602ca5be4a4c0841a178775bc82b3be0b38f (commit)
      from  dde096e03fa4912aa44b2b72cfbdb7676340a3d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23ba602ca5be4a4c0841a178775bc82b3be0b38f
Author: Timur Golubovich <tim...@sy...>
Date:   Fri Jun 7 16:42:16 2024 +0300

    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 <tim...@sy...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8325
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c
index 53d2151fd..edd36f2e6 100644
--- a/src/jtag/drivers/remote_bitbang.c
+++ b/src/jtag/drivers/remote_bitbang.c
@@ -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;

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/remote_bitbang.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository