diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-09-18 17:29:23 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-09-22 12:51:54 -0400 |
| commit | f06ec3608fe5237dcbf2399de727e001eb8465f7 (patch) | |
| tree | e18e3350f5e28211fd1ed65783689ca58c93af04 | |
| parent | faa3e74bd72779031464bc096bd1a3cdb89ace33 (diff) | |
| download | trace-cmd-f06ec3608fe5237dcbf2399de727e001eb8465f7.tar.gz | |
trace-cmd hook: Remove malloc_or_die
Exit nicely if malloc fails.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | trace-hooks.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/trace-hooks.c b/trace-hooks.c index 1d2bff21..4238f83c 100644 --- a/trace-hooks.c +++ b/trace-hooks.c @@ -37,12 +37,16 @@ struct hook_list *tracecmd_create_event_hook(const char *arg) int ch; int i; - hook = malloc_or_die(sizeof(*hook)); + hook = malloc(sizeof(*hook)); + if (!hook) + return NULL; memset(hook, 0, sizeof(*hook)); str = strdup(arg); - if (!str) - die("malloc"); + if (!str) { + free(hook); + return NULL; + } hook->str = str; hook->hook = arg; @@ -157,7 +161,7 @@ struct hook_list *tracecmd_create_event_hook(const char *arg) return hook; invalid_tok: - die("Invalid hook format '%s'", arg); + warning("Invalid hook format '%s'", arg); return NULL; } |