[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-rc2-7-g84a2302af

[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  84a2302af790d28f5dd7e03620703710300305f1 (commit)
      from  f68ade529a9ec68032e23c8d3c75c36179b4103f (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 84a2302af790d28f5dd7e03620703710300305f1
Author: Krzysztof Hockuba <krz...@it...>
Date:   Wed Feb 3 23:01:29 2021 +0100

    Fix jtag_usb_location_equal for path members > 9
    
    In case an USB location path contains path members
    larger than 9. The string_length variable is regardless
    decremented by 2 with assumption that the member is
    one digit length. For exmaple 1-12.2 will fail.
    This patch uses strlen to calculate
    digits in a path member.
    
    Change-Id: I9c26a04d0c6af13fec65157f222599497294e2b2
    Signed-off-by: Krzysztof Hockuba <krz...@ho...>
    Reviewed-on: http://openocd.zylin.com/6048
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/jtag_usb_common.c b/src/jtag/drivers/jtag_usb_common.c
index 969ea8406..309f8c462 100644
--- a/src/jtag/drivers/jtag_usb_common.c
+++ b/src/jtag/drivers/jtag_usb_common.c
@@ -50,7 +50,7 @@ bool jtag_usb_location_equal(uint8_t dev_bus, uint8_t *port_path,
 		goto done;
 	}
 
-	string_length -= 1;
+	string_length -= strnlen(ptr, string_length);
 	/* check bus mismatch */
 	if (atoi(ptr) != dev_bus)
 		goto done;
@@ -68,7 +68,7 @@ bool jtag_usb_location_equal(uint8_t dev_bus, uint8_t *port_path,
 			break;
 
 		path_step++;
-		string_length -= 2;
+		string_length -= strnlen(ptr, string_length) + 1;
 	};
 
 	/* walked the full path, all elements match */

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

Summary of changes:
 src/jtag/drivers/jtag_usb_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository