From 3625ee318a844f438efcce10a273143ed0001900 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Fri, 27 Jun 2025 11:57:26 +0200 Subject: [PATCH 1/2] Fix SEGV in cmdhf15 due to argtable size being miscomputed --- client/src/cmdhf15.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index c2727fa38..383aa0d7c 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -2624,7 +2624,7 @@ static int CmdHF15Restore(const char *Cmd) { "hf 15 restore -u E011223344556677 -f hf-15-my-dump.bin" ); - void *argtable[6 + 5] = {0}; + void *argtable[6 + 4] = {0}; uint8_t arglen = arg_add_default(argtable); argtable[arglen++] = arg_str0("f", "file", "", "Specify a filename for dump file"); argtable[arglen++] = arg_int0("r", "retry", "", "number of retries (def 3)"); From 6c402791f12c09eef4bc2f898afe58935b9f2602 Mon Sep 17 00:00:00 2001 From: Jean-Michel Picod Date: Fri, 27 Jun 2025 12:04:27 +0200 Subject: [PATCH 2/2] Fix comma instead of semicolon --- client/src/cmdhf15.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index 383aa0d7c..0e19c9192 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -3498,8 +3498,8 @@ static int CmdHF15Wipe(const char *Cmd) { ); void *argtable[6 + 3] = {0}; uint8_t arglen = arg_add_default(argtable); - argtable[arglen++] = arg_int0(NULL, "bs", "", "block size (def 4)"), - argtable[arglen++] = arg_lit0("v", "verbose", "verbose output"); + argtable[arglen++] = arg_int0(NULL, "bs", "", "block size (def 4)"); + argtable[arglen++] = arg_lit0("v", "verbose", "verbose output"); argtable[arglen++] = arg_param_end; CLIExecWithReturn(ctx, Cmd, argtable, true);