[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc2-36-gc913e4d5a

[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  c913e4d5a6cafab9a19735c440be8d0c111b2088 (commit)
      from  77c7abe4e7569ca8bb23dad6110c7209c8c55558 (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 c913e4d5a6cafab9a19735c440be8d0c111b2088
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Dec 17 23:05:23 2022 +0100

    jtag: fix build with configure --enable-verbose
    
    With flag --enable-verbose, configure enables compiling some
    conditional code that with new gcc triggers an error:
            error: '%04x' directive output may be truncated writing
            between 4 and 8 bytes into a region of size 5
            [-Werror=format-truncation=]
    
    Extend the buffer to contain the full 8 bytes of %04x on a 'int'
    and change the limit in snprintf.
    Skip the intermediate buffer 's[4]'.
    Align the code to the coding style.
    
    Change-Id: Ifc8a6e4686555578a7355a1f6049471fd5e31913
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Karl Hammar <ka...@as...>
    Reported-by: Tommy Murphy <tom...@ho...>
    Fixes: https://sourceforge.net/p/openocd/tickets/376/
    Reviewed-on: https://review.openocd.org/c/openocd/+/7403
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index a3e9e1712..7db3c7b15 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -776,17 +776,12 @@ static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 
 static void armjtagew_debug_buffer(uint8_t *buffer, int length)
 {
-	char line[81];
-	char s[4];
-	int i;
-	int j;
+	char line[8 + 3 * BYTES_PER_LINE + 1];
 
-	for (i = 0; i < length; i += BYTES_PER_LINE) {
-		snprintf(line, 5, "%04x", i);
-		for (j = i; j < i + BYTES_PER_LINE && j < length; j++) {
-			snprintf(s, 4, " %02x", buffer[j]);
-			strcat(line, s);
-		}
+	for (int i = 0; i < length; i += BYTES_PER_LINE) {
+		int n = snprintf(line, 9, "%04x", i);
+		for (int j = i; j < i + BYTES_PER_LINE && j < length; j++)
+			n += snprintf(line + n, 4, " %02x", buffer[j]);
 		LOG_DEBUG("%s", line);
 
 		/* Prevent GDB timeout (writing to log might take some time) */
diff --git a/src/jtag/drivers/opendous.c b/src/jtag/drivers/opendous.c
index d0c527788..c353aef40 100644
--- a/src/jtag/drivers/opendous.c
+++ b/src/jtag/drivers/opendous.c
@@ -796,17 +796,12 @@ int opendous_usb_read(struct opendous_jtag *opendous_jtag)
 
 void opendous_debug_buffer(uint8_t *buffer, int length)
 {
-	char line[81];
-	char s[4];
-	int i;
-	int j;
+	char line[8 + 3 * BYTES_PER_LINE + 1];
 
-	for (i = 0; i < length; i += BYTES_PER_LINE) {
-		snprintf(line, 5, "%04x", i);
-		for (j = i; j < i + BYTES_PER_LINE && j < length; j++) {
-			snprintf(s, 4, " %02x", buffer[j]);
-			strcat(line, s);
-		}
+	for (int i = 0; i < length; i += BYTES_PER_LINE) {
+		int n = snprintf(line, 9, "%04x", i);
+		for (int j = i; j < i + BYTES_PER_LINE && j < length; j++)
+			n += snprintf(line + n, 4, " %02x", buffer[j]);
 		LOG_DEBUG("%s", line);
 	}
 }

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

Summary of changes:
 src/jtag/drivers/arm-jtag-ew.c | 15 +++++----------
 src/jtag/drivers/opendous.c    | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository