Skip to content
Snippets Groups Projects
Commit 934b14f2 authored by Stephen Warren's avatar Stephen Warren Committed by Tom Rini
Browse files

ext4: free allocations by parse_path()


parse_path() malloc()s the entries in the array it's passed. Those
allocations must be free()d by the caller, ext4fs_get_parent_inode_num().
Add code to do this.

For this to work, all the array entries must be dynamically allocated,
rather than a mix of dynamic and static allocations. Fix parse_path() not
to over-write arr[0] with a pointer to statically allocated data.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Tested-by: default avatarLukasz Majewski <l.majewski@samsung.com>
parent 676505f5
No related branches found
No related tags found
No related merge requests found
......@@ -615,8 +615,7 @@ static int parse_path(char **arr, char *dirname)
arr[i] = zalloc(strlen("/") + 1);
if (!arr[i])
return -ENOMEM;
arr[i++] = "/";
memcpy(arr[i++], "/", strlen("/"));
/* add each path entry after root */
while (token != NULL) {
......@@ -746,6 +745,11 @@ end:
fail:
free(depth_dirname);
free(parse_dirname);
for (i = 0; i < depth; i++) {
if (!ptr[i])
break;
free(ptr[i]);
}
free(ptr);
free(parent_inode);
free(first_inode);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment