mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-27 06:04:40 +08:00
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: Stephen Warren <swarren@nvidia.com> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
This commit is contained in:
parent
676505f5ce
commit
934b14f2bb
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user