fixup! built-in add -i: implement the main loop

dscho · dscho · commit 0cf5b03c88d5 · 2019-11-14T15:01:50.000+01:00
Whoops, a buffer overrun.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/add-interactive.c b/add-interactive.c
@@ -343,7 +343,8 @@ static ssize_t list_and_choose(struct add_i_state *s,
 				}
 			}
 
-			p[sep] = '\0';
+			if (p[sep])
+				p[sep++] = '\0';
 			if (from < 0) {
 				from = find_unique(p, items);
 				if (from >= 0)
@@ -369,7 +370,7 @@ static ssize_t list_and_choose(struct add_i_state *s,
 					res += choose ? +1 : -1;
 				}
 
-			p += sep + 1;
+			p += sep;
 		}
 
 		if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||

Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,8 @@ static ssize_t list_and_choose(struct add_i_state *s,`
`343`	`343`	`}`
`344`	`344`	`}`
`345`	`345`
`346`		`- p[sep] = '\0';`
	`346`	`+ if (p[sep])`
	`347`	`+ p[sep++] = '\0';`
`347`	`348`	`if (from < 0) {`
`348`	`349`	`from = find_unique(p, items);`
`349`	`350`	`if (from >= 0)`
`@@ -369,7 +370,7 @@ static ssize_t list_and_choose(struct add_i_state *s,`
`369`	`370`	`res += choose ? +1 : -1;`
`370`	`371`	`}`
`371`	`372`
`372`		`- p += sep + 1;`
	`373`	`+ p += sep;`
`373`	`374`	`}`
`374`	`375`
`375`	`376`	`if ((immediate && res != LIST_AND_CHOOSE_ERROR) \|\|`