X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tree.c;h=ca800a85f771be1bd10d6575d93ca05bd3fc381c;hb=1c9da46da4fe5cf99c5f6ab251419d0f412ecfba;hp=a978c53a308fa36fd4c666c3035bc17626fdc871;hpb=62d046a07b4cd4328d3d40aab097a1d97c4d7b20;p=git.git diff --git a/tree.c b/tree.c index a978c53a..ca800a85 100644 --- 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); - 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] = '/';