From: Namhyung Kim <namhyung.kim@lge.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@gmail.com>, Ingo Molnar <mingo@kernel.org>,
Arnaldo Carvalho de Melo <acme@infradead.org>,
Borislav Petkov <bp@alien8.de>, David Ahern <dsahern@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 01/11] parse-events: Free flag/sym field on failure path
Date: Mon, 23 Apr 2012 13:58:28 +0900 [thread overview]
Message-ID: <1335157118-14658-2-git-send-email-namhyung.kim@lge.com> (raw)
In-Reply-To: <1335157118-14658-1-git-send-email-namhyung.kim@lge.com>
If parsing flag/sym field failed after allocating it, it
should be freed.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
parse-events.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/parse-events.c b/parse-events.c
index bd078ba..81e6581 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -2166,10 +2166,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
value = arg_eval(arg);
if (value == NULL)
- goto out_free;
+ goto out_free_field;
field->value = strdup(value);
if (field->value == NULL)
- goto out_free;
+ goto out_free_field;
free_arg(arg);
arg = alloc_arg();
@@ -2177,14 +2177,14 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
free_token(token);
type = process_arg(event, arg, &token);
if (test_type_token(type, token, EVENT_OP, "}"))
- goto out_free;
+ goto out_free_field_value;
value = arg_eval(arg);
if (value == NULL)
- goto out_free;
+ goto out_free_field_value;
field->str = strdup(value);
if (field->str == NULL)
- goto out_free;
+ goto out_free_field_value;
free_arg(arg);
arg = NULL;
@@ -2198,6 +2198,10 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
*tok = token;
return type;
+out_free_field_value:
+ free(field->value);
+out_free_field:
+ free(field);
out_free:
free_arg(arg);
free_token(token);
--
1.7.10
next prev parent reply other threads:[~2012-04-23 4:59 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-23 4:58 [PATCH 00/11] trace-cmd: libparsevent cleanups - part 2 Namhyung Kim
2012-04-23 4:58 ` Namhyung Kim [this message]
2012-04-23 16:21 ` [PATCH 01/11] parse-events: Free flag/sym field on failure path Steven Rostedt
2012-04-24 0:05 ` Namhyung Kim
2012-04-24 1:07 ` [PATCH v2] " Namhyung Kim
2012-04-23 4:58 ` [PATCH 02/11] parse-events: Fix freeing arg on process_dynamic_array() Namhyung Kim
2012-04-23 16:34 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 03/11] parse-events: Get rid of handling concatenation on event_read_print Namhyung Kim
2012-04-23 16:33 ` Steven Rostedt
2012-04-24 0:09 ` Namhyung Kim
2012-04-24 0:26 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 04/11] parse-events: Remove unused arg->dynarray.index Namhyung Kim
2012-04-23 18:35 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 05/11] parse-events: Use proper function parameter type Namhyung Kim
2012-04-23 18:38 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 06/11] parse-events: Pass string type argument to args Namhyung Kim
2012-04-23 18:41 ` Steven Rostedt
2012-07-06 11:16 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 07/11] parse-events: Do not call add_event() again if allocation failed Namhyung Kim
2012-04-23 18:43 ` Steven Rostedt
2012-07-06 11:17 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 08/11] parse-events: Fix some comments Namhyung Kim
2012-04-23 18:47 ` Steven Rostedt
2012-07-06 11:18 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 09/11] parse-filter: Check result of malloc() during reading token Namhyung Kim
2012-04-23 18:48 ` Steven Rostedt
2012-04-24 0:15 ` Namhyung Kim
2012-07-06 11:19 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-23 4:58 ` [PATCH 10/11] parse-filter: Fix signature of create_arg_item() Namhyung Kim
2012-04-23 18:57 ` Steven Rostedt
2012-04-23 4:58 ` [PATCH 11/11] parse-filter: Check return value of arg_to_str() Namhyung Kim
2012-04-23 18:59 ` Steven Rostedt
2012-07-06 11:20 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
2012-04-24 1:29 ` [PATCH 12/11] parse-events: Cleanup realloc use Namhyung Kim
2012-05-15 8:39 ` Namhyung Kim
2012-05-15 8:48 ` Steven Rostedt
2012-05-15 9:32 ` Namhyung Kim
2012-07-06 11:21 ` [tip:perf/core] tools lib traceevent: " tip-bot for Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335157118-14658-2-git-send-email-namhyung.kim@lge.com \
--to=namhyung.kim@lge.com \
--cc=acme@infradead.org \
--cc=bp@alien8.de \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).