Skip to contentSkip to conversation

Fix memory leaks in read_tree_recursive()

PATCH In review Jonas Fonseca 2 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix memory leaks in read_tree_recursive()

This patch fixes memory leaks in the error path of read_tree_recursive().

tree.c (mode:100644) renamed from tree.c (mode:100644 sha1:4a26603f6e32866c0db8a01ac1c228be801f76c6) +6 -2
@@ -39,14 +39,18 @@
 		if (S_ISDIR(mode)) {
 			int retval;
 			int pathlen = strlen(path);
-			char *newbase = xmalloc(baselen + 1 + pathlen);
+			char *newbase;
 			void *eltbuf;
 			char elttype[20];
 			unsigned long eltsize;
 
 			eltbuf = read_sha1_file(sha1, elttype, &eltsize);
-			if (!eltbuf || strcmp(elttype, "tree"))
+			if (!eltbuf || strcmp(elttype, "tree")) {
+				if (eltbuf) mem_free(eltbuf);
 				return -1;
+			}
+
+			newbase = xmalloc(baselen + 1 + pathlen);
 			memcpy(newbase, base, baselen);
 			memcpy(newbase + baselen, path, pathlen);
 			newbase[baselen + pathlen] = '/';
Signature · 1 line
Jonas Fonseca
#1 lore raw

PATCH 1/1 Fix memory leaks in read_tree_recursive()

This patch fixes memory leaks in read_tree_recursive().

---

Sorry, typo in the previous patch. I will try to be more careful. This patch has already been applied to cogito.

tree.c (mode:100644) renamed from tree.c (mode:100644 sha1:4a26603f6e32866c0db8a01ac1c228be801f76c6) +6 -2
@@ -39,14 +39,18 @@
 		if (S_ISDIR(mode)) {
 			int retval;
 			int pathlen = strlen(path);
-			char *newbase = xmalloc(baselen + 1 + pathlen);
+			char *newbase;
 			void *eltbuf;
 			char elttype[20];
 			unsigned long eltsize;
 
 			eltbuf = read_sha1_file(sha1, elttype, &eltsize);
-			if (!eltbuf || strcmp(elttype, "tree"))
+			if (!eltbuf || strcmp(elttype, "tree")) {
+				if (eltbuf) free(eltbuf);
 				return -1;
+			}
+
+			newbase = xmalloc(baselen + 1 + pathlen);
 			memcpy(newbase, base, baselen);
 			memcpy(newbase + baselen, path, pathlen);
 			newbase[baselen + pathlen] = '/';
Signature · 1 line
Jonas Fonseca
#2 lore raw
In reply to Jonas Fonseca
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"JF" == Jonas Fonseca <[email protected]> writes:

JF> This patch fixes memory leaks in the error path of JF> read_tree_recursive().

The leak seems to be real but what is "mem_free"? Has it been compile tested?

JF> @@ -39,14 +39,18 @@
JF> if (S_ISDIR(mode)) {
JF> int retval;

JF> ...

JF> -			if (!eltbuf || strcmp(elttype, "tree"))
JF> +			if (!eltbuf || strcmp(elttype, "tree")) {

JF> + if (eltbuf) mem_free(eltbuf);
JF> return -1;

Btw, who is putting this header in your mail? It does not make sense to me unless Jonas is pseudonym for Linus...

Mail-Followup-To: Linus Torvalds <[email protected]>, [email protected]

#3 lore raw

Junio C Hamano <[email protected]> wrote Wed, May 04, 2005:

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"JF" == Jonas Fonseca <[email protected]> writes:

JF> This patch fixes memory leaks in the error path of JF> read_tree_recursive().

The leak seems to be real but what is "mem_free"?

That mem_free() was a bad habbit from the project I usually work on.

Quoted 1 line

Has it been compile tested?

No, but the second patch has.

BTW, when compiling git on a FreeBSD box I get these warnings:

date.c: In function `parse_date':
date.c:414: warning: long unsigned int format, time_t arg (arg 4) date.c:414: warning: long unsigned int format, time_t arg (arg 4) date.c: In function `datestamp':
date.c:427: warning: long unsigned int format, time_t arg (arg 4) date.c:427: warning: long unsigned int format, time_t arg (arg 4) tar-tree.c: In function `write_header':
tar-tree.c:249: warning: long unsigned int format, time_t arg (arg 3) local-pull.c: In function `fetch':
local-pull.c:73: warning: long int format, different type arg (arg 4)

because time_t is defined as int32_t. Don't know if they are worth fixing at this point.

Quoted 7 lines

JF> @@ -39,14 +39,18 @@
JF> if (S_ISDIR(mode)) {
JF> int retval;

JF> ...

JF> -			if (!eltbuf || strcmp(elttype, "tree"))
JF> +			if (!eltbuf || strcmp(elttype, "tree")) {
Quoted 7 lines

JF> + if (eltbuf) mem_free(eltbuf);
JF> return -1;

Btw, who is putting this header in your mail? It does not make sense to me unless Jonas is pseudonym for Linus...

Mail-Followup-To: Linus Torvalds <[email protected]>, [email protected]

Maybe because Mutt knows I am subscribe to this mailing list and assumes I don't want to have mail addressed directly to my email address?

I just hit 'g'.

Signature · 1 line
Jonas Fonseca