helper: fix arm11 help text
authorSpencer Oliver <spen@spen-soft.co.uk>
Tue, 20 Dec 2011 16:15:52 +0000 (16:15 +0000)
committerSpencer Oliver <spen@spen-soft.co.uk>
Tue, 3 Jan 2012 09:30:14 +0000 (09:30 +0000)
This fixes a long standing bug: see Trac #4
Increased help text recursion limit and added LOG_DEBUG so we can
catch future errors like this.

Change-Id: I5fac95c4486eaddaf1e88a27ecb1835168f87711
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/291
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>
src/helper/command.c

index b00a231268cb7fb77f47a2c7dc6b7261e0707e31..552031df063d1614e53e143bb910ac18f57388a3 100644 (file)
@@ -97,7 +97,7 @@ static struct log_capture_state *command_log_capture_start(Jim_Interp *interp)
  * Therefore we set the tcl return value only if we actually
  * captured output.
  */
-static void command_log_capture_finish(struct log_capture_state *state) 
+static void command_log_capture_finish(struct log_capture_state *state)
 {
        if (NULL == state)
                return;
@@ -927,8 +927,10 @@ static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
                        return -ENOMEM;
        }
 
-       if (++n >= 2)
-               return ERROR_OK;
+       if (++n > 5) {
+               LOG_ERROR("command recursion exceeded");
+               return ERROR_FAIL;
+       }
 
        return CALL_COMMAND_HANDLER(command_help_show_list,
                        c->children, n, show_help, match);

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)