ipdbg: fix double free of virtual-ir data

[openocd.git] / src / target / avr32_regs.c

diff --git a/src/target/avr32_regs.c b/src/target/avr32_regs.c
index eb283fc30882ea3d39d4a6194e2c61a099abdcae..d6fd0e0020414a4f70401e29ca0946f4ae37a496 100644 (file)
--- a/src/target/avr32_regs.c
+++ b/src/target/avr32_regs.c
@@ -1,21 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2010 by Oleksandr Tymoshenko <gonzo@bluezbox.com>       *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -25,7 +13,7 @@
 #include "avr32_jtag.h"
 #include "avr32_regs.h"
 
-static int avr32_jtag_read_reg(struct avr32_jtag *jtag_info, int reg, 
+static int avr32_jtag_read_reg(struct avr32_jtag *jtag_info, int reg,
                uint32_t *val)
 {
        int retval;
@@ -36,27 +24,27 @@ static int avr32_jtag_read_reg(struct avr32_jtag *jtag_info, int reg,
                return retval;
 
        do {
-               retval = avr32_jtag_nexus_read(jtag_info, 
+               retval = avr32_jtag_nexus_read(jtag_info,
                        AVR32_OCDREG_DCSR, &dcsr);
 
                if (retval != ERROR_OK)
                        return retval;
        } while (!(dcsr & OCDREG_DCSR_CPUD));
 
-       retval = avr32_jtag_nexus_read(jtag_info, 
+       retval = avr32_jtag_nexus_read(jtag_info,
                        AVR32_OCDREG_DCCPU, val);
 
        return retval;
 }
 
-static int avr32_jtag_write_reg(struct avr32_jtag *jtag_info, int reg, 
+static int avr32_jtag_write_reg(struct avr32_jtag *jtag_info, int reg,
                uint32_t val)
 {
        int retval;
        uint32_t dcsr;
 
        /* Restore Status reg */
-       retval = avr32_jtag_nexus_write(jtag_info, 
+       retval = avr32_jtag_nexus_write(jtag_info,
                                AVR32_OCDREG_DCEMU, val);
        if (retval != ERROR_OK)
                return retval;
@@ -65,7 +53,7 @@ static int avr32_jtag_write_reg(struct avr32_jtag *jtag_info, int reg,
        if (retval != ERROR_OK)
                return retval;
        do {
-               retval = avr32_jtag_nexus_read(jtag_info, 
+               retval = avr32_jtag_nexus_read(jtag_info,
                        AVR32_OCDREG_DCSR, &dcsr);
        } while (!(dcsr & OCDREG_DCSR_EMUD) && (retval == ERROR_OK));
 
@@ -79,7 +67,7 @@ int avr32_jtag_read_regs(struct avr32_jtag *jtag_info, uint32_t *regs)
        int i, retval;
 
        /* read core registers */
-       for (i = 0; i < AVR32NUMCOREREGS - 1; i++) 
+       for (i = 0; i < AVR32NUMCOREREGS - 1; i++)
                avr32_jtag_read_reg(jtag_info, i, regs + i);
 
        /* read status register */
@@ -97,6 +85,9 @@ int avr32_jtag_write_regs(struct avr32_jtag *jtag_info, uint32_t *regs)
        int i, retval;
 
        retval = avr32_jtag_write_reg(jtag_info, 0, regs[AVR32_REG_SR]);
+       if (retval != ERROR_OK)
+               return retval;
+
        /* Restore Status reg */
        retval = avr32_jtag_exec(jtag_info, MTSR(0, 0));
        if (retval != ERROR_OK)
@@ -105,7 +96,7 @@ int avr32_jtag_write_regs(struct avr32_jtag *jtag_info, uint32_t *regs)
        /*
         * And now the rest of registers
         */
-       for (i = 0; i < AVR32NUMCOREREGS - 1; i++) 
+       for (i = 0; i < AVR32NUMCOREREGS - 1; i++)
                avr32_jtag_write_reg(jtag_info, i, regs[i]);
 
        return ERROR_OK;