[PATCH] read_tree_recursive(): Fix leaks

Fix two potential leaks.

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Petr Baudis <pasky@ucw.cz>

diff --git a/tree.c b/tree.c
index a978c53a308fa36fd4c666c3035bc17626fdc871..ca800a85f771be1bd10d6575d93ca05bd3fc381c 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -39,14 +39,17 @@ static int read_tree_recursive(void *buffer, unsigned long size,
                if (S_ISDIR(mode)) {
                        int retval;
                        int pathlen = strlen(path);
                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);
                        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;
                                return -1;

+                       }
+                       newbase = xmalloc(baselen + 1 + pathlen);

                        memcpy(newbase, base, baselen);
                        memcpy(newbase + baselen, path, pathlen);
                        newbase[baselen + pathlen] = '/';
                        memcpy(newbase, base, baselen);
                        memcpy(newbase + baselen, path, pathlen);
                        newbase[baselen + pathlen] = '/';