Commit 8383a50b870f78d970e3d7efa1addf07c3d4ef4a

Stefan Sperling 2021-10-17T14:11:32

always initialize output parameter "n" of get_line() in diff3.c

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/lib/diff3.c b/lib/diff3.c
index bedddef..cc1852c 100644
--- a/lib/diff3.c
+++ b/lib/diff3.c
@@ -684,6 +684,8 @@ get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
 	char *new;
 
 	*ret = NULL;
+	if (n != NULL)
+		*n = 0;
 
 	len = getline(&cp, &size, b);
 	if (len == -1) {