Browse: make sure 'X' doesn't loop forever searching backwards.

it did once..

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/vpatch.c b/vpatch.c
index 1f510e636f38509ed50a491003c7ed65cce2f6fe..f93b52288511ab8d07a21cbc7ecdbbccc672524c 100644 (file)
--- a/vpatch.c
+++ b/vpatch.c
@@ -2261,6 +2261,8 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
                                    && ci.merger[tpos.p.m].type != Unchanged)
                                        do_mark = 1;
                                e = prev_melmnt(&tpos.p, fm, fb, fa, ci.merger);
+                               if (tpos.p.m < 0)
+                                       break;
                        } while (!ends_line(e) ||
                                 visible(mode & (RESULT|AFTER), ci.merger, &tpos) < 0);
                        tpos = pos;
@@ -2274,6 +2276,8 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace,
                                                        ci.merger[tpos.p.m].oldtype;
                                }
                                e = prev_melmnt(&tpos.p, fm, fb, fa, ci.merger);
+                               if (tpos.p.m < 0)
+                                       break;
                        } while (!ends_line(e) ||
                                 visible(mode & (RESULT|AFTER), ci.merger, &tpos) < 0);
                        p->conflicts = isolate_conflicts(