patch parse: dup the lines of the patches from the callers

ethomson · ethomson · commit c5dda465312f · 2015-09-24T10:32:15.000-04:00
diff --git a/src/patch.c b/src/patch.c
@@ -196,12 +196,6 @@ int git_patch_get_line_in_hunk(
 
 static void git_patch__free(git_patch *patch)
 {
-	git_array_clear(patch->lines);
-	git_array_clear(patch->hunks);
-
-	git__free((char *)patch->binary.old_file.data);
-	git__free((char *)patch->binary.new_file.data);
-
 	if (patch->free_fn)
 		patch->free_fn(patch);
 }
diff --git a/src/patch_diff.c b/src/patch_diff.c
@@ -25,6 +25,12 @@ static void patch_diff_free(git_patch *p)
 {
 	git_patch_diff *patch = (git_patch_diff *)p;
 
+    git_array_clear(patch->base.lines);
+	git_array_clear(patch->base.hunks);
+
+	git__free((char *)patch->base.binary.old_file.data);
+	git__free((char *)patch->base.binary.new_file.data);
+
 	git_diff_file_content__clear(&patch->ofile);
 	git_diff_file_content__clear(&patch->nfile);
 
diff --git a/src/patch_parse.c b/src/patch_parse.c
@@ -523,7 +523,7 @@ static int parse_hunk_body(
 	int newlines = hunk->hunk.new_lines;
 
 	for (;
-	ctx->remain > 4 && (oldlines || newlines) &&
+		ctx->remain > 4 && (oldlines || newlines) &&
 		memcmp(ctx->line, "@@ -", 4) != 0;
 		parse_advance_line(ctx)) {
 
@@ -566,7 +566,9 @@ static int parse_hunk_body(
 
 		memset(line, 0x0, sizeof(git_diff_line));
 
-		line->content = ctx->line + prefix;
+		line->content = git__strndup(ctx->line + prefix, ctx->line_len - prefix);
+		GITERR_CHECK_ALLOC(line->content);
+
 		line->content_len = ctx->line_len - prefix;
 		line->content_offset = ctx->content_len - ctx->remain;
 		line->origin = origin;
@@ -939,10 +941,21 @@ static int check_patch(git_patch_parsed *patch)
 static void patch_parsed__free(git_patch *p)
 {
 	git_patch_parsed *patch = (git_patch_parsed *)p;
+	git_diff_line *line;
+	size_t i;
 
 	if (!patch)
 		return;
 
+	git_array_foreach(patch->base.lines, i, line)
+		git__free((char *)line->content);
+
+	git__free((char *)patch->base.binary.old_file.data);
+	git__free((char *)patch->base.binary.new_file.data);
+	git_array_clear(patch->base.hunks);
+	git_array_clear(patch->base.lines);
+	git__free(patch->base.delta);
+
 	git__free(patch->old_prefix);
 	git__free(patch->new_prefix);
 	git__free(patch->header_old_path);
@@ -951,9 +964,6 @@ static void patch_parsed__free(git_patch *p)
 	git__free(patch->rename_new_path);
 	git__free(patch->old_path);
 	git__free(patch->new_path);
-	git_array_clear(patch->base.hunks);
-	git_array_clear(patch->base.lines);
-	git__free(patch->base.delta);
 	git__free(patch);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -196,12 +196,6 @@ int git_patch_get_line_in_hunk(`
`196`	`196`
`197`	`197`	`static void git_patch__free(git_patch *patch)`
`198`	`198`	`{`
`199`		`- git_array_clear(patch->lines);`
`200`		`- git_array_clear(patch->hunks);`
`201`		`-`
`202`		`- git__free((char *)patch->binary.old_file.data);`
`203`		`- git__free((char *)patch->binary.new_file.data);`
`204`		`-`
`205`	`199`	`if (patch->free_fn)`
`206`	`200`	`patch->free_fn(patch);`
`207`	`201`	`}`