From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org, namhyung@kernel.org
Subject: [PATCH 2/8] trace-cmd: Handle strdup() error in parse_option_name()
Date: Tue, 14 Jul 2020 13:30:21 +0300 [thread overview]
Message-ID: <20200714103027.2477584-3-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20200714103027.2477584-1-tz.stoyanov@gmail.com>
Modified internal function parse_option_name() to return error and handle
that error in function callers in case strdup() fails.
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/traceevent/event-plugin.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/traceevent/event-plugin.c b/lib/traceevent/event-plugin.c
index c11636ce..b97d0c7e 100644
--- a/lib/traceevent/event-plugin.c
+++ b/lib/traceevent/event-plugin.c
@@ -254,7 +254,7 @@ void tep_plugin_remove_options(struct tep_plugin_option *options)
}
}
-static void parse_option_name(char **option, char **plugin)
+static int parse_option_name(char **option, char **plugin)
{
char *p;
@@ -265,8 +265,9 @@ static void parse_option_name(char **option, char **plugin)
*p = '\0';
*option = strdup(p + 1);
if (!*option)
- return;
+ return -1;
}
+ return 0;
}
static struct tep_plugin_option *
@@ -325,7 +326,8 @@ int tep_plugin_add_option(const char *name, const char *val)
if (!option_str)
return -ENOMEM;
- parse_option_name(&option_str, &plugin);
+ if (parse_option_name(&option_str, &plugin) < 0)
+ return -ENOMEM;
/* If the option exists, update the val */
for (op = trace_plugin_options; op; op = op->next) {
--
2.26.2
next prev parent reply other threads:[~2020-07-14 10:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 10:30 [PATCH 0/8] Few libtraceeevnt fixes, suggested Namhyung Kim Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 1/8] trace-cmd: Document tep_load_plugins_hook() Tzvetomir Stoyanov (VMware)
2020-07-14 14:28 ` Steven Rostedt
2020-07-14 15:22 ` Tzvetomir Stoyanov
2020-07-14 15:53 ` Steven Rostedt
2020-07-14 10:30 ` Tzvetomir Stoyanov (VMware) [this message]
2020-07-14 10:30 ` [PATCH 3/8] trace-cmd: Fix typo in tep_plugin_add_option() description Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 4/8] trace-cmd: Improve error handling of tep_plugin_add_option() API Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 5/8] trace-cmd: Fixed broken indentation in parse_ip4_print_args() Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 6/8] trace-cmd: Fixed type in PRINT_FMT_STING Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 7/8] trace-cmd: Fixed description of tep_add_plugin_path() API Tzvetomir Stoyanov (VMware)
2020-07-14 10:30 ` [PATCH 8/8] trace-cmd: Handle possible strdup() error in " Tzvetomir Stoyanov (VMware)
2020-07-14 12:07 ` [PATCH 0/8] Few libtraceeevnt fixes, suggested Namhyung Kim Namhyung Kim
2020-07-14 12:12 ` Tzvetomir Stoyanov
2020-07-14 14:25 ` Steven Rostedt
2020-07-14 14:22 ` Steven Rostedt
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=20200714103027.2477584-3-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=namhyung@kernel.org \
--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).