X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=6ec452f7bc689c02ff663ab2cd1f6f1a068fe08c;hb=7769a75e96f998b2f1ef51e8a2e88058f56fa519;hp=22dfc843da1528ffd0466d496c50c56702e55a24;hpb=4bdbfb15b2d2ad1fbe144dcde386e71bcdff91d0;p=git.git

diff --git a/rerere.c b/rerere.c
index 22dfc843d..6ec452f7b 100644
--- a/rerere.c
+++ b/rerere.c
@@ -47,8 +47,14 @@ static void read_rr(struct string_list *rr)
 		name = xstrdup(buf);
 		if (fgetc(in) != '\t')
 			die("corrupt MERGE_RR");
-		for (i = 0; i < sizeof(buf) && (buf[i] = fgetc(in)); i++)
-			; /* do nothing */
+		for (i = 0; i < sizeof(buf); i++) {
+			int c = fgetc(in);
+			if (c < 0)
+				die("corrupt MERGE_RR");
+			buf[i] = c;
+			if (c == 0)
+				 break;
+		}
 		if (i == sizeof(buf))
 			die("filename too long");
 		string_list_insert(rr, buf)->util = name;