target/adi_v5_swd: fix segfault when calling jtag_to_swd 56/2256/2
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"

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)