o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

acme: fix off by one in editcmd, pointer comparison in getch, nextc

Browse source 
R=r
http://codereview.appspot.com/868046
This commit is contained in:
Russ Cox 2010-07-14 11:08:42 -07:00
parent efe48aa670
commit 75a851e927
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/acme/edit.c
View file

@ -164,7 +164,7 @@ editcmd(Text *ct, Rune *r, uint n)
free(cmdstartp); free(cmdstartp);
cmdstartp = runemalloc(n+2); cmdstartp = runemalloc(n+2);
runemove(cmdstartp, r, n); runemove(cmdstartp, r, n);
if(r[n] != '\n') if(r[n-1] != '\n')
cmdstartp[n++] = '\n'; cmdstartp[n++] = '\n';
cmdstartp[n] = '\0'; cmdstartp[n] = '\0';
cmdendp = cmdstartp+n; cmdendp = cmdstartp+n;
@ -195,7 +195,7 @@ editcmd(Text *ct, Rune *r, uint n)
int int
getch(void) getch(void)
{ {
if(*cmdp == *cmdendp) if(cmdp == cmdendp)
return -1; return -1;
return *cmdp++; return *cmdp++;
} }
@ -203,7 +203,7 @@ getch(void)
int int
nextc(void) nextc(void)
{ {
if(*cmdp == *cmdendp) if(cmdp == cmdendp)
return -1; return -1;
return *cmdp; return *cmdp;
} }