# [PATCH] Fix memory leaks in read_tree_recursive() 4 messages from 2005-05-04 to 2005-05-05. Participants: Jonas Fonseca, Junio C Hamano. Thread: https://gitlist.dev/t/479 ## Jonas Fonseca, 2005-05-04 23:19 Subject: [PATCH] Fix memory leaks in read_tree_recursive() Message-ID: <20050504231959.GA25475@diku.dk> URL: https://gitlist.dev/e/20050504231959.GA25475%40diku.dk ``` This patch fixes memory leaks in the error path of read_tree_recursive(). Signed-off-by: Jonas Fonseca --- 571c0f4599fbeefd995bbc24480add1575c36c94/tree.c (mode:100644 sha1:4a26603f6e32866c0db8a01ac1c228be801f76c6) +++ uncommitted/tree.c (mode:100644) @@ -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] = '/'; -- Jonas Fonseca ``` ## Jonas Fonseca, 2005-05-04 23:39 Subject: [PATCH] Fix memory leaks in read_tree_recursive() Message-ID: <20050504233936.GA25873@diku.dk> URL: https://gitlist.dev/e/20050504233936.GA25873%40diku.dk In-Reply-To: <20050504231959.GA25475@diku.dk> ``` This patch fixes memory leaks in read_tree_recursive(). Signed-off-by: Jonas Fonseca --- Sorry, typo in the previous patch. I will try to be more careful. This patch has already been applied to cogito. --- 571c0f4599fbeefd995bbc24480add1575c36c94/tree.c (mode:100644 sha1:4a26603f6e32866c0db8a01ac1c228be801f76c6) +++ uncommitted/tree.c (mode:100644) @@ -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] = '/'; -- Jonas Fonseca ``` ## Junio C Hamano, 2005-05-04 23:43 Subject: Re: [PATCH] Fix memory leaks in read_tree_recursive() Message-ID: <7vpsw6muay.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vpsw6muay.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20050504231959.GA25475@diku.dk> ``` >>>>> "JF" == Jonas Fonseca 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 , git@vger.kernel.org ``` ## Jonas Fonseca, 2005-05-05 00:08 Subject: Re: [PATCH] Fix memory leaks in read_tree_recursive() Message-ID: <20050505000815.GA25992@diku.dk> URL: https://gitlist.dev/e/20050505000815.GA25992%40diku.dk In-Reply-To: <7vpsw6muay.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote Wed, May 04, 2005: > >>>>> "JF" == Jonas Fonseca 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. > 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. > 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 , git@vger.kernel.org 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'. -- Jonas Fonseca ```