rerere: Fix use of an empty strbuf.buf

The code incorrectly assumed that strbuf.buf is always an allocated piece of memory that has NUL at offset strbuf.len. That assumption does not hold for a freshly initialized empty strbuf. Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Sep 27, 2007 · b4833a2 · b4833a2
1 parent 1dffb8f
commit b4833a2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/builtin-rerere.c b/builtin-rerere.c
@@ -113,8 +113,10 @@ static int handle_file(const char *path,
 				fputs(">>>>>>>\n", out);
 			}
 			if (sha1) {
-				SHA1_Update(&ctx, one.buf, one.len + 1);
-				SHA1_Update(&ctx, two.buf, two.len + 1);
+				SHA1_Update(&ctx, one.buf ? one.buf : "",
+					    one.len + 1);
+				SHA1_Update(&ctx, two.buf ? two.buf : "",
+					    two.len + 1);
 			}
 			strbuf_reset(&one);
 			strbuf_reset(&two);