ipdbg: fix double free of virtual-ir data

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

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 57480118758bc56e3226ae2a1102f7f0cf7fc7b1..c84d5aa3d3d32e0a263bc12f31565563bb97fe3c 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -951,9 +951,9 @@ int default_interface_jtag_execute_queue(void)
                        return ERROR_OK;
        }
 
-       int result = adapter_driver->jtag_ops->execute_queue();
+       struct jtag_command *cmd = jtag_command_queue_get();
+       int result = adapter_driver->jtag_ops->execute_queue(cmd);
 
-       struct jtag_command *cmd = jtag_command_queue;
        while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
                switch (cmd->type) {
                        case JTAG_SCAN:
@@ -1049,7 +1049,7 @@ static int jtag_reset_callback(enum jtag_event event, void *priv)
 
                /* current instruction is either BYPASS or IDCODE */
                buf_set_ones(tap->cur_instr, tap->ir_length);
-               tap->bypass = 1;
+               tap->bypass = true;
        }
 
        return ERROR_OK;
@@ -1177,7 +1177,7 @@ static bool jtag_examine_chain_end(uint8_t *idcodes, unsigned count, unsigned ma
 static bool jtag_examine_chain_match_tap(const struct jtag_tap *tap)
 {
 
-       if (tap->expected_ids_cnt == 0 || !tap->hasidcode)
+       if (tap->expected_ids_cnt == 0 || !tap->has_idcode)
                return true;
 
        /* optionally ignore the JTAG version field - bits 28-31 of IDCODE */
@@ -1283,13 +1283,13 @@ static int jtag_examine_chain(void)
                        /* Zero for LSB indicates a device in bypass */
                        LOG_INFO("TAP %s does not have valid IDCODE (idcode=0x%" PRIx32 ")",
                                        tap->dotted_name, idcode);
-                       tap->hasidcode = false;
+                       tap->has_idcode = false;
                        tap->idcode = 0;
 
                        bit_count += 1;
                } else {
                        /* Friendly devices support IDCODE */
-                       tap->hasidcode = true;
+                       tap->has_idcode = true;
                        tap->idcode = idcode;
                        jtag_examine_chain_display(LOG_LVL_INFO, "tap/device found", tap->dotted_name, idcode);
 
@@ -1464,7 +1464,7 @@ void jtag_tap_init(struct jtag_tap *tap)
        buf_set_u32(tap->expected_mask, 0, ir_len_bits, tap->ir_capture_mask);
 
        /* TAP will be in bypass mode after jtag_validate_ircapture() */
-       tap->bypass = 1;
+       tap->bypass = true;
        buf_set_ones(tap->cur_instr, tap->ir_length);
 
        /* register the reset callback for the TAP */