libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closed a memory leak which happened in case of memory shortage.

Browse Source
This commit is contained in:
Thomas Schmitt 2011-04-11 20:49:03 +02:00
parent ae5ab4a08f
commit 81608815ae
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libisofs/tree.c
View File

@ -968,32 +968,33 @@ int iso_tree_path_to_node(IsoImage *image, const char *path, IsoNode **node)
char *iso_tree_get_node_path(IsoNode *node) char *iso_tree_get_node_path(IsoNode *node)
{ {
if (node == NULL || node->parent == NULL) { char *path = NULL, *parent_path = NULL;
if (node == NULL || node->parent == NULL)
return NULL; return NULL;
}
if ((IsoNode*)node->parent == node) { if ((IsoNode*)node->parent == node) {
return strdup("/"); return strdup("/");
} else { } else {
char *path = NULL, *parent_path;
parent_path = iso_tree_get_node_path((IsoNode*)node->parent); parent_path = iso_tree_get_node_path((IsoNode*)node->parent);
if (parent_path == NULL) { if (parent_path == NULL)
return NULL; goto ex;
}
if (strlen(parent_path) == 1) { if (strlen(parent_path) == 1) {
path = calloc(1, strlen(node->name) + 2); path = calloc(1, strlen(node->name) + 2);
if (path == NULL) if (path == NULL)
return NULL; goto ex;
sprintf(path, "/%s", node->name); sprintf(path, "/%s", node->name);
} else { } else {
path = calloc(1, strlen(parent_path) + strlen(node->name) + 2); path = calloc(1, strlen(parent_path) + strlen(node->name) + 2);
if (path == NULL) if (path == NULL)
return NULL; goto ex;
sprintf(path, "%s/%s", parent_path, node->name); sprintf(path, "%s/%s", parent_path, node->name);
} }
free(parent_path);
return path;
} }
ex:;
if (parent_path != NULL)
free(parent_path);
return path;
} }
/* ------------------------- tree cloning ------------------------------ */ /* ------------------------- tree cloning ------------------------------ */