src/cmd/sam/file.c - Issue 165071: sam: fix off-by-one in buffer merge.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: src/cmd/sam/file.c

Issue 165071: sam: fix off-by-one in buffer merge. (Closed)

Patch Set: code review 165071: sam: fix off-by-one in buffer merge. Created 15 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.

Jump to:

Index: src/cmd/sam/file.c

===================================================================

--- a/src/cmd/sam/file.c

+++ b/src/cmd/sam/file.c

@@ -139,7 +139,7 @@

if(merge.f != f

|| 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();

if(ns>=RBUFSIZE){

@@ -178,7 +178,7 @@

if(merge.f != f

|| 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();

merge.f = f;

merge.p0 = p0;

« no previous file with comments | « no previous file | no next file » | no next file with comments »