1 files changed, 5 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index 01a8437f5c..76ca651369 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -491,7 +491,11 @@ static void show_parent_lno(struct sline *sline, unsigned long l0, unsigned long
 
 static int hunk_comment_line(const char *bol)
 {
-	int ch = *bol & 0xff;
+	int ch;
+
+	if (!bol)
+		return 0;
+	ch = *bol & 0xff;
 	return (isalpha(ch) || ch == '_' || ch == '$');
 }