This is an automated email from Gerrit.

Antonio Borneo ([email protected]) just uploaded a new patch set to 
Gerrit, which you can find at http://openocd.zylin.com/6061

-- gerrit

commit 708ae85b032a0341f32ed54bbadd87592d4ddca2
Author: Antonio Borneo <[email protected]>
Date:   Sat Feb 13 23:28:16 2021 +0100

    stlink: swo: use completely the available buffer
    
    The buffer passed to stlink_usb_trace_read() is allocated of size
    *size and does not need to be zero-terminated. There is no reason
    to not fill its last byte.
    
    When checking the bytes available on swo, limit the retrieved byte
    length to *size.
    
    Change-Id: Iade0f8963118695931f13a8a3f1ab204911236b6
    Signed-off-by: Antonio Borneo <[email protected]>
    Reported-by: Adrian Negreanu <[email protected]>

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 4545bcb..0925ae4 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -1748,7 +1748,7 @@ static int stlink_usb_trace_read(void *handle, uint8_t 
*buf, size_t *size)
                        return res;
 
                size_t bytes_avail = le_to_h_u16(h->databuf);
-               *size = bytes_avail < *size ? bytes_avail : *size - 1;
+               *size = bytes_avail < *size ? bytes_avail : *size;
 
                if (*size > 0) {
                        res = stlink_usb_read_trace(handle, buf, *size);

-- 


_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to