morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

udev: fix two trivial memleaks in error path

Browse Source 
Based-on-a-patch-by: Ian Stakenvicius <axs@gentoo.org>
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-07-18 19:36:55 -04:00
parent 86d7de3686
commit ef89eef77e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/udev/collect/collect.c
View File

@@ -442,19 +442,19 @@ int main(int argc, char **argv)
if (debug)
fprintf(stderr, "ID %s: not in database\n", argv[i]);
him = malloc(sizeof (struct _mate));
him = new(struct _mate, 1);
if (!him) {
ret = ENOMEM;
goto out;
}
him->name = malloc(strlen(argv[i]) + 1);
him->name = strdup(argv[i]);
if (!him->name) {
free(him);
ret = ENOMEM;
goto out;
}
strcpy(him->name, argv[i]);
him->state = STATE_NONE;
udev_list_node_append(&him->node, &bunch);
} else {

4
src/udev/udevadm-hwdb.c
View File

@@ -303,8 +303,10 @@ static int64_t trie_store_nodes(struct trie_f *trie, struct trie_node *node) {
int64_t child_off;
child_off = trie_store_nodes(trie, node->children[i].child);
if (child_off < 0)
if (child_off < 0) {
free(children);
return child_off;
}
children[i].c = node->children[i].c;
children[i].child_off = htole64(child_off);
}