Commit Diff


commit - f7140bf5466ac08e50c960b81fbf24800a66c39c
commit + 8e831ff19c364e7b4a4d77885cd3421502daeed3
blob - ecf2b8063ad69e00446caa86291e09ff43ca00ee
blob + 760f87b7c0057df475e28cc403bb02373f19f7f2
--- lib/diff3.c
+++ lib/diff3.c
@@ -683,6 +683,8 @@ get_line(char **ret, FILE *b, size_t *n, struct diff3_
 	char *new;
 
 	*ret = NULL;
+	if (n != NULL)
+		*n = 0;
 
 	len = getline(&cp, &size, b);
 	if (len == -1) {