JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix order of bounds checks; inspired by NetBSD#50747

Browse Source
This commit is contained in:
tg 2016-04-14 11:51:26 +00:00
parent 83cde99aee
commit 1cc8f76f07
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
edit.c
View File

@ -28,7 +28,7 @@
#ifndef MKSH_NO_CMDLINE_EDITING #ifndef MKSH_NO_CMDLINE_EDITING
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.294 2016/03/04 14:26:12 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.295 2016/04/14 11:51:26 tg Exp $");
/* /*
* in later versions we might use libtermcap for this, but since external * in later versions we might use libtermcap for this, but since external
@ -4918,16 +4918,16 @@ forwword(int argcnt)
ncursor = es->cursor; ncursor = es->cursor;
while (ncursor < es->linelen && argcnt--) { while (ncursor < es->linelen && argcnt--) {
if (ksh_isalnux(es->cbuf[ncursor])) if (ksh_isalnux(es->cbuf[ncursor]))
while (ksh_isalnux(es->cbuf[ncursor]) && while (ncursor < es->linelen &&
ncursor < es->linelen) ksh_isalnux(es->cbuf[ncursor]))
ncursor++; ncursor++;
else if (!ksh_isspace(es->cbuf[ncursor])) else if (!ksh_isspace(es->cbuf[ncursor]))
while (!ksh_isalnux(es->cbuf[ncursor]) && while (ncursor < es->linelen &&
!ksh_isspace(es->cbuf[ncursor]) && !ksh_isalnux(es->cbuf[ncursor]) &&
ncursor < es->linelen) !ksh_isspace(es->cbuf[ncursor]))
ncursor++; ncursor++;
while (ksh_isspace(es->cbuf[ncursor]) && while (ncursor < es->linelen &&
ncursor < es->linelen) ksh_isspace(es->cbuf[ncursor]))
ncursor++; ncursor++;
} }
return (ncursor); return (ncursor);
@ -4991,11 +4991,11 @@ Forwword(int argcnt)
ncursor = es->cursor; ncursor = es->cursor;
while (ncursor < es->linelen && argcnt--) { while (ncursor < es->linelen && argcnt--) {
while (!ksh_isspace(es->cbuf[ncursor]) && while (ncursor < es->linelen &&
ncursor < es->linelen) !ksh_isspace(es->cbuf[ncursor]))
ncursor++; ncursor++;
while (ksh_isspace(es->cbuf[ncursor]) && while (ncursor < es->linelen &&
ncursor < es->linelen) ksh_isspace(es->cbuf[ncursor]))
ncursor++; ncursor++;
} }
return (ncursor); return (ncursor);