[PATCH]: 2c9c2bdf79 target/arm_tpiu_swo: Fix division by zero

[gerrit]

This is an automated email from Gerrit.

"zapb <d...@zapb.de>" just uploaded a new patch set to Gerrit, which you can 
find at https://review.openocd.org/c/openocd/+/8224

-- gerrit

commit 2c9c2bdf790fc5a34b43b381be5ba16f37504665
Author: Marc Schink <d...@zapb.de>
Date:   Sun Apr 28 12:47:42 2024 +0200

    target/arm_tpiu_swo: Fix division by zero
    
    When external capturing is configured (default), the SWO pin frequency
    is required. Enforce this to avoid a division by zero error.
    
    While at it, ensure that the 'out_filename' variable always contains a
    valid string. This saves a few checks and makes the code more clean and
    readable.
    
    Change-Id: If8c1dae9549dd10e2f21d5b896414d47edac9fc2
    Signed-off-by: Marc Schink <d...@zapb.de>

diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index 5cea682ec4..ba942b348d 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -153,7 +153,7 @@ static int arm_tpiu_swo_poll_trace(void *priv)
                }
        }
 
-       if (obj->out_filename && obj->out_filename[0] == ':')
+       if (obj->out_filename[0] == ':')
                list_for_each_entry(c, &obj->connections, lh)
                        if (connection_write(c->connection, buf, size) != 
(int)size)
                                LOG_ERROR("Error writing to connection"); /* 
FIXME: which connection? */
@@ -201,7 +201,7 @@ static void arm_tpiu_swo_close_output(struct 
arm_tpiu_swo_object *obj)
                fclose(obj->file);
                obj->file = NULL;
        }
-       if (obj->out_filename && obj->out_filename[0] == ':')
+       if (obj->out_filename[0] == ':')
                remove_service(TCP_SERVICE_NAME, &obj->out_filename[1]);
 }
 
@@ -625,9 +625,18 @@ COMMAND_HANDLER(handle_arm_tpiu_swo_enable)
                return ERROR_FAIL;
        }
 
-       if (obj->pin_protocol == TPIU_SPPR_PROTOCOL_MANCHESTER || 
obj->pin_protocol == TPIU_SPPR_PROTOCOL_UART)
-               if (!obj->swo_pin_freq)
+       const bool output_external = !strcmp(obj->out_filename, "external");
+
+       if (obj->pin_protocol == TPIU_SPPR_PROTOCOL_MANCHESTER || 
obj->pin_protocol == TPIU_SPPR_PROTOCOL_UART) {
+               if (!obj->swo_pin_freq) {
+                       if (output_external) {
+                               command_print(CMD, "SWO pin frequency required 
when using external capturing");
+                               return ERROR_FAIL;
+                       }
+
                        LOG_DEBUG("SWO pin frequency not set, will be 
autodetected by the adapter");
+               }
+       }
 
        struct target *target = get_current_target(CMD_CTX);
 
@@ -705,7 +714,7 @@ COMMAND_HANDLER(handle_arm_tpiu_swo_enable)
        uint16_t prescaler = 1; /* dummy value */
        unsigned int swo_pin_freq = obj->swo_pin_freq; /* could be replaced */
 
-       if (obj->out_filename && strcmp(obj->out_filename, "external") && 
obj->out_filename[0]) {
+       if (!output_external) {
                if (obj->out_filename[0] == ':') {
                        struct arm_tpiu_swo_priv_connection *priv = 
malloc(sizeof(*priv));
                        if (!priv) {
@@ -947,6 +956,7 @@ static int jim_arm_tpiu_swo_create(Jim_Interp *interp, int 
argc, Jim_Obj *const
        adiv5_mem_ap_spot_init(&obj->spot);
        obj->spot.base = TPIU_SWO_DEFAULT_BASE;
        obj->port_width = 1;
+       obj->out_filename = strdup("external");
 
        Jim_Obj *n;
        jim_getopt_obj(&goi, &n);

--