commit 0cd162be8887069823eb8e987be551fdd593c623
author Carlos Martín Nieto <carlosmn@github.com> Tue Nov 15 16:28:10 2016 +0100
committer GitHub <noreply@github.com> Tue Nov 15 16:28:10 2016 +0100
tree b69f6d5fdc7de53a2e96a7bfe0c1975958cfb93e
parent 1db3035d74a8f734d65b4e779d3e4b22cfd90ebb
parent 613381fc1461514fdbb1518799bcee0345fdece6

Merge pull request #4008 from pks-t/pks/sortedcache-fd-leak

sortedcache: plug leaked file descriptor

src/patch_parse.c

diff --git a/src/patch_parse.c b/src/patch_parse.c
index 7a4fe9f..f527594 100644
--- a/src/patch_parse.c
+++ b/src/patch_parse.c
@@ -1014,8 +1014,10 @@
 		return NULL;
 
 	if (content_len) {
-		if ((ctx->content = git__malloc(content_len)) == NULL)
+		if ((ctx->content = git__malloc(content_len)) == NULL) {
+			git__free(ctx);
 			return NULL;
+		}
 
 		memcpy((char *)ctx->content, content, content_len);
 	}

src/sortedcache.c

diff --git a/src/sortedcache.c b/src/sortedcache.c
index ed4199b..5bd989a 100644
--- a/src/sortedcache.c
+++ b/src/sortedcache.c
@@ -216,6 +216,7 @@
 	if (p_fstat(fd, &st) < 0) {
 		giterr_set(GITERR_OS, "failed to stat file");
 		error = -1;
+		(void)p_close(fd);
 		goto unlock;
 	}