shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

udevd: fix some memory leaks in error path

Browse Source 
Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>
This commit is contained in:
Yin Kangkai 2010-08-02 18:31:18 +08:00 committed by Kay Sievers
parent 5047f82de4
commit 1851332c08
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
udev/udev-rules.c
View File

@ -1761,13 +1761,18 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
/* init token array and string buffer */
rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token));
if (rules->tokens == NULL)
if (rules->tokens == NULL) {
free(rules);
return NULL;
}
rules->token_max = PREALLOC_TOKEN;
rules->buf = malloc(PREALLOC_STRBUF);
if (rules->buf == NULL)
if (rules->buf == NULL) {
free(rules->tokens);
free(rules);
return NULL;
}
rules->buf_max = PREALLOC_STRBUF;
/* offset 0 is always '\0' */
rules->buf[0] = '\0';
@ -1776,8 +1781,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node));
if (rules->trie_nodes == NULL)
if (rules->trie_nodes == NULL) {
free(rules->buf);
free(rules->tokens);
free(rules);
return NULL;
}
rules->trie_nodes_max = PREALLOC_TRIE;
/* offset 0 is the trie root, with an empty string */
memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));

4
udev/udevd.c
View File

@ -227,8 +227,10 @@ static void worker_new(struct event *event)
udev_monitor_enable_receiving(worker_monitor);
worker = calloc(1, sizeof(struct worker));
if (worker == NULL)
if (worker == NULL) {
udev_monitor_unref(worker_monitor);
return;
}
/* worker + event reference */
worker->refcount = 2;
worker->udev = event->udev;