Merge pull request libgit2#4768 from abyss7/master

ethomson · web-flow · commit 5b0258add926 · 2018-08-19T23:01:38.000+01:00
Fix leak in index.c
diff --git a/src/index.c b/src/index.c
@@ -1802,7 +1802,8 @@ int git_index_conflict_add(git_index *index,
 		if (entries[i] && !valid_filemode(entries[i]->mode)) {
 			giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",
 				i + 1);
-			return -1;
+			ret = -1;
+			goto on_error;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,8 @@ int git_index_conflict_add(git_index *index,`
`1802`	`1802`	`if (entries[i] && !valid_filemode(entries[i]->mode)) {`
`1803`	`1803`	`giterr_set(GITERR_INDEX, "invalid filemode for stage %d entry",`
`1804`	`1804`	`i + 1);`
`1805`		`- return -1;`
	`1805`	`+ ret = -1;`
	`1806`	`+ goto on_error;`
`1806`	`1807`	`}`
`1807`	`1808`	`}`
`1808`	`1809`