fix for sanitizer errors in left shifts

[openocd.git] / src / jtag / core.c

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 0fbd327fe6ece8c3d674fd98a4ad5d3f46ecf834..e57f62db7df1012979e05e51d06b318adaf0096b 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -1007,7 +1007,7 @@ static bool jtag_examine_chain_match_tap(const struct jtag_tap *tap)
                return true;
 
        /* optionally ignore the JTAG version field - bits 28-31 of IDCODE */
-       uint32_t mask = tap->ignore_version ? ~(0xf << 28) : ~0;
+       uint32_t mask = tap->ignore_version ? ~(0xfU << 28) : ~0U;
        uint32_t idcode = tap->idcode & mask;
 
        /* Loop over the expected identification codes and test for a match */
@@ -1308,6 +1308,14 @@ void jtag_tap_free(struct jtag_tap *tap)
 {
        jtag_unregister_event_callback(&jtag_reset_callback, tap);
 
+       struct jtag_tap_event_action *jteap = tap->event_action;
+       while (jteap) {
+               struct jtag_tap_event_action *next = jteap->next;
+               Jim_DecrRefCount(jteap->interp, jteap->body);
+               free(jteap);
+               jteap = next;
+       }
+
        free(tap->expected);
        free(tap->expected_mask);
        free(tap->expected_ids);
@@ -1486,8 +1494,6 @@ int adapter_quit(void)
                t = n;
        }
 
-       dap_cleanup_all();
-
        return ERROR_OK;
 }
 
@@ -1837,7 +1843,7 @@ void adapter_deassert_reset(void)
                LOG_ERROR("transport is not selected");
 }
 
-int adapter_config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
+int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol,
                         uint32_t port_size, unsigned int *trace_freq)
 {
        if (jtag->config_trace)