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

sam: fix off-by-one in buffer merge.

Browse source 
exposed by UTFmax==4

R=rsc
http://codereview.appspot.com/165071
This commit is contained in:
Russ Cox 2009-12-06 17:27:08 -08:00
parent 1d919bc080
commit 846cec9ebc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd/sam/file.c
View file

@ -139,7 +139,7 @@ loginsert(File *f, uint p0, Rune *s, uint ns)
if(merge.f != f if(merge.f != f
|| p0-(merge.p0+merge.n)>Maxmerge /* too far */ || p0-(merge.p0+merge.n)>Maxmerge /* too far */
|| merge.nbuf+((p0+ns)-(merge.p0+merge.n))>RBUFSIZE) /* too long */ || merge.nbuf+((p0+ns)-(merge.p0+merge.n))>=RBUFSIZE) /* too long */
flushmerge(); flushmerge();
if(ns>=RBUFSIZE){ if(ns>=RBUFSIZE){
@ -178,7 +178,7 @@ logdelete(File *f, uint p0, uint p1)
if(merge.f != f if(merge.f != f
|| p0-(merge.p0+merge.n)>Maxmerge /* too far */ || p0-(merge.p0+merge.n)>Maxmerge /* too far */
|| merge.nbuf+(p0-(merge.p0+merge.n))>RBUFSIZE){ /* too long */ || merge.nbuf+(p0-(merge.p0+merge.n))>=RBUFSIZE){ /* too long */
flushmerge(); flushmerge();
merge.f = f; merge.f = f;
merge.p0 = p0; merge.p0 = p0;