From 34524a3c5da2a8f6e9e13e112b6c55cc71e757ea Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sat, 20 Nov 2021 16:28:02 +0100 Subject: Bugfix in reading scramble --- TODO.md | 3 --- nissy-2.0beta3.tar.gz | Bin 53146 -> 53146 bytes src/alg.c | 2 +- src/commands.c | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/TODO.md b/TODO.md index 0ed9c21..d035dd9 100644 --- a/TODO.md +++ b/TODO.md @@ -3,9 +3,6 @@ This is a list of things that I would like to add or change at some point. It's more of a personal reminder than anything else. -## Bugs -* Segfault on "nissy solve -s 10U" (no space between 10 and U) - ## Commands ### Commands that are available in nissy 1.0, but not in this version (yet): diff --git a/nissy-2.0beta3.tar.gz b/nissy-2.0beta3.tar.gz index e35868f..bd7dd17 100644 Binary files a/nissy-2.0beta3.tar.gz and b/nissy-2.0beta3.tar.gz differ diff --git a/src/alg.c b/src/alg.c index 354bdb6..cd6834c 100644 --- a/src/alg.c +++ b/src/alg.c @@ -231,7 +231,7 @@ new_alg(char *str) } move_read = false; - for (j = 0; j < NMOVES; j++) { + for (j = U; j < NMOVES; j++) { if (str[i] == move_string(j)[0] || (str[i] >= 'a' && str[i] <= 'z' && str[i] == move_string(j)[0]-('A'-'a') && j<=B)) { diff --git a/src/commands.c b/src/commands.c index b089a1c..48f5eba 100644 --- a/src/commands.c +++ b/src/commands.c @@ -322,8 +322,8 @@ read_scramble(int c, char **v, CommandArgs *args) unsigned int j; char *algstr; - if (new_alg(v[0])->len == 0) { - fprintf(stderr, "%s: moves or option unrecognized\n", v[0]); + if (c < 1 || new_alg(v[0])->len == 0) { + fprintf(stderr, "Error reading scramble\n"); return false; } -- cgit v1.3