helper: fix arm11 help text
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>
This commit is contained in:
parent
7e2257663d
commit
4c11906241
|
@ -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
|
* Therefore we set the tcl return value only if we actually
|
||||||
* captured output.
|
* 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)
|
if (NULL == state)
|
||||||
return;
|
return;
|
||||||
|
@ -927,8 +927,10 @@ static COMMAND_HELPER(command_help_show, struct command *c, unsigned n,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (++n >= 2)
|
if (++n > 5) {
|
||||||
return ERROR_OK;
|
LOG_ERROR("command recursion exceeded");
|
||||||
|
return ERROR_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
return CALL_COMMAND_HANDLER(command_help_show_list,
|
return CALL_COMMAND_HANDLER(command_help_show_list,
|
||||||
c->children, n, show_help, match);
|
c->children, n, show_help, match);
|
||||||
|
|
Loading…
Reference in New Issue