cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge3: fix exit conditions -- l, r are never nil

Browse source
This commit is contained in:
Ori Bernstein 2024-07-30 00:42:51 +00:00
parent c409b9127d
commit 0136b08a10
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/src/cmd/diff/merge3.c
View file

@ -117,7 +117,7 @@ merge(Diff *l, Diff *r)
rx = (rc->oldx < rc->oldy) ? rc->oldx : rc->oldy;
ry = (rc->oldx < rc->oldy) ? rc->oldy : rc->oldx;
}
if(l != nil && r != nil && overlaps(lx, ly, rx, ry)){
if(lc != nil && rc != nil && overlaps(lx, ly, rx, ry)){
/*
* align the edges of the chunks
*/
@ -160,12 +160,12 @@ merge(Diff *l, Diff *r)
ln = y+1;
il++;
ir++;
}else if(rc == nil || (lc != nil && lx < rx)){
}else if(lc != nil && (rc == nil || lx < rx)){
fetch(l, l->ixold, ln, lc->oldx-1, l->input[0], "");
fetch(l, l->ixnew, lc->newx, lc->newy, l->input[1], "");
ln = lc->oldy+1;
il++;
}else if(lc == nil || (rc != nil && rx < lx)){
}else if(rc != nil && (lc == nil || rx < lx)){
fetch(l, l->ixold, ln, rc->oldx-1, l->input[0], "");
fetch(r, r->ixnew, rc->newx, rc->newy, r->input[1], "");
ln = rc->oldy+1;