Commit Diff

Commit:
4f18c4000896c6ade7e7bd662d05f75686d338b2
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
Message:
fix another segfault in edscript() Same problem as fixed in 90de04bc7f1b85b9c491bcd124f6178fad005de1. ok stsp
Actions:
Patch | Tree
commit - 924100791157ab7f6842e7c7b5bd225c00ad5aab
commit + 4f18c4000896c6ade7e7bd662d05f75686d338b2
blob - 9b918583a6db04e4fff29bcb04a7490e23db43cc
blob + bedddefb3685f60d8be606b79ba77249b65ed22c
--- lib/diff3.c
+++ lib/diff3.c
@@ -1048,7 +1048,7 @@ edscript(int n, struct diff3_state *d3s)
 				goto done;
 		} else {
 			err = diff_output(d3s->diffbuf, "%s%s\n.\n",
-			    line[linelen] == '\n' ? ":" : "",
+			    linelen > 0 && line[linelen] == '\n' ? ":" : "",
 			    d3s->f3mark);
 			if (err)
 				goto done;