]> git.sur5r.net Git - openocd/commitdiff
target/adi_v5_swd: fix segfault when calling jtag_to_swd
authorPaul Fertser <fercerpav@gmail.com>
Sun, 17 Aug 2014 08:19:47 +0000 (12:19 +0400)
committerAndreas Fritiofson <andreas.fritiofson@gmail.com>
Mon, 8 Sep 2014 20:18:51 +0000 (20:18 +0000)
When SWD mode is not supported by the target adapter, the call should
return an error instead of segfaulting.

Change-Id: I1626097deb93ecfbe78a6e82d812c7a673dbbde5
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2256
Tested-by: jenkins
src/target/adi_v5_swd.c

index f8d3650edb6894e42795f90f666a4e4384ece0f4..6e322fb411503cda45048afa3152b523c94408ed 100644 (file)
@@ -253,6 +253,11 @@ int dap_to_swd(struct target *target)
        struct arm *arm = target_to_arm(target);
        int retval;
 
+       if (!arm->dap) {
+               LOG_ERROR("SWD mode is not available");
+               return ERROR_FAIL;
+       }
+
        LOG_DEBUG("Enter SWD mode");
 
        /* REVISIT it's ugly to need to make calls to a "jtag"