lkml.org 
[lkml]   [2012]   [Jul]   [6]   [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: Check result of malloc() during reading token
    Commit-ID:  e54b34aed1c4082ed03f4d1f7a19276059b1e30a
    Gitweb: http://git.kernel.org/tip/e54b34aed1c4082ed03f4d1f7a19276059b1e30a
    Author: Namhyung Kim <namhyung.kim@lge.com>
    AuthorDate: Mon, 23 Apr 2012 13:58:36 +0900
    Committer: Namhyung Kim <namhyung@kernel.org>
    CommitDate: Wed, 4 Jul 2012 13:40:31 +0900

    tools lib traceevent: Check result of malloc() during reading token

    The malloc can fail so the return value should be checked. For now,
    just use malloc_or_die().

    Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: David Ahern <dsahern@gmail.com>
    Link: http://lkml.kernel.org/r/1335157118-14658-10-git-send-email-namhyung.kim@lge.com
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/lib/traceevent/parse-filter.c | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
    index 80d872a..d54c2b4 100644
    --- a/tools/lib/traceevent/parse-filter.c
    +++ b/tools/lib/traceevent/parse-filter.c
    @@ -96,7 +96,7 @@ static enum event_type read_token(char **tok)
    (strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&
    pevent_peek_char() == '~') {
    /* append it */
    - *tok = malloc(3);
    + *tok = malloc_or_die(3);
    sprintf(*tok, "%c%c", *token, '~');
    free_token(token);
    /* Now remove the '~' from the buffer */

    \
     
     \ /
      Last update: 2012-07-06 14:02    [W:4.066 / U:1.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site