lkml.org 
[lkml]   [2013]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] tools lib traceevent: Get rid of malloc_or_die() in read_token()
    Commit-ID:  91dfa49bdd8ef9600d850ef68ec892eb70824e3d
    Gitweb: http://git.kernel.org/tip/91dfa49bdd8ef9600d850ef68ec892eb70824e3d
    Author: Namhyung Kim <namhyung@kernel.org>
    AuthorDate: Thu, 12 Dec 2013 16:36:07 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Fri, 13 Dec 2013 10:30:21 -0300

    tools lib traceevent: Get rid of malloc_or_die() in read_token()

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung.kim@lge.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Link: http://lkml.kernel.org/r/1386833777-3790-5-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/lib/traceevent/parse-filter.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
    index ab9cefe..246ee81 100644
    --- a/tools/lib/traceevent/parse-filter.c
    +++ b/tools/lib/traceevent/parse-filter.c
    @@ -109,7 +109,11 @@ static enum event_type read_token(char **tok)
    (strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&
    pevent_peek_char() == '~') {
    /* append it */
    - *tok = malloc_or_die(3);
    + *tok = malloc(3);
    + if (*tok == NULL) {
    + free_token(token);
    + return EVENT_ERROR;
    + }
    sprintf(*tok, "%c%c", *token, '~');
    free_token(token);
    /* Now remove the '~' from the buffer */
    @@ -1123,6 +1127,8 @@ process_filter(struct event_format *event, struct filter_arg **parg,
    break;
    case EVENT_NONE:
    break;
    + case EVENT_ERROR:
    + goto fail_alloc;
    default:
    goto fail_print;
    }

    \
     
     \ /
      Last update: 2013-12-16 17:21    [W:4.206 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site