diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2014-02-25 21:22:11 +0400 |
|---|---|---|
| committer | Paul Fertser <fercerpav@gmail.com> | 2014-03-29 06:55:13 +0000 |
| commit | 58256d48358ab695e970b5e61546aecb366ad914 (patch) | |
| tree | 0eb0bb676d2de4a2db5149b24955457726197dc6 /src/flash/nor/tcl.c | |
| parent | d2ddb53f7d3c6c5c3be1f6b41a796033599b1880 (diff) | |
| download | riscv-openocd-58256d48358ab695e970b5e61546aecb366ad914.zip riscv-openocd-58256d48358ab695e970b5e61546aecb366ad914.tar.gz riscv-openocd-58256d48358ab695e970b5e61546aecb366ad914.tar.bz2 | |
flash/nor/tcl: fix segfault on write_image misuse
"flash write_image (unlock|erase)" (without filename) was causing
segmentation fault in strcmp(). This patch fixes it.
Change-Id: Ia3b8c796f4107621d78605c02d2b8e123b1b207b
Reported-by: ajkroll][ <ajkroll][@irc.freenode.net>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1970
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/flash/nor/tcl.c')
| -rw-r--r-- | src/flash/nor/tcl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c index 916ebf7..32a666c 100644 --- a/src/flash/nor/tcl.c +++ b/src/flash/nor/tcl.c @@ -349,14 +349,11 @@ COMMAND_HANDLER(handle_flash_write_image_command) int retval; - if (CMD_ARGC < 1) - return ERROR_COMMAND_SYNTAX_ERROR; - /* flash auto-erase is disabled by default*/ int auto_erase = 0; bool auto_unlock = false; - for (;; ) { + while (CMD_ARGC) { if (strcmp(CMD_ARGV[0], "erase") == 0) { auto_erase = 1; CMD_ARGV++; |