public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>
Subject: [RFC PATCH 6/8] perf pmu: Make pmu_formats_string to check return value of strbuf
Date: Fri, 29 Apr 2016 23:47:27 +0900	[thread overview]
Message-ID: <20160429144727.24984.47674.stgit@devbox> (raw)
In-Reply-To: <20160429144632.24984.93027.stgit@devbox>

Make pmu_formats_string() to check return value of
strbuf APIs so that it can detect errors in it.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 tools/perf/util/pmu.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index bf34468..ddb0261 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -643,20 +643,20 @@ static int pmu_resolve_param_term(struct parse_events_term *term,
 static char *pmu_formats_string(struct list_head *formats)
 {
 	struct perf_pmu_format *format;
-	char *str;
-	struct strbuf buf;
+	char *str = NULL;
+	struct strbuf buf = STRBUF_INIT;
 	unsigned i = 0;
 
 	if (!formats)
 		return NULL;
 
-	strbuf_init(&buf, 0);
 	/* sysfs exported terms */
 	list_for_each_entry(format, formats, list)
-		strbuf_addf(&buf, i++ ? ",%s" : "%s",
-			    format->name);
+		if (strbuf_addf(&buf, i++ ? ",%s" : "%s", format->name) < 0)
+			goto error;
 
 	str = strbuf_detach(&buf, NULL);
+error:
 	strbuf_release(&buf);
 
 	return str;

  parent reply	other threads:[~2016-04-29 14:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-29 14:46 [RFC PATCH 0/8] perf tools: Update strbuf to remove xrealloc Masami Hiramatsu
2016-04-29 14:46 ` [RFC PATCH 1/8] perf: Rewrite strbuf not to die Masami Hiramatsu
2016-04-29 14:46 ` [RFC PATCH 2/8] perf probe: Check the return value of strbuf APIs Masami Hiramatsu
2016-04-29 14:47 ` [RFC PATCH 3/8] perf help: Make check_emacsclient_version to check " Masami Hiramatsu
2016-04-29 14:47 ` [RFC PATCH 4/8] perf: Make alias handler to check return value of strbuf Masami Hiramatsu
2016-04-29 14:47 ` [RFC PATCH 5/8] perf header: Make topology checkers " Masami Hiramatsu
2016-04-29 14:47 ` Masami Hiramatsu [this message]
2016-04-29 14:47 ` [RFC PATCH 7/8] perf help: Do not use ALLOC_GROW in add_cmd_list Masami Hiramatsu
2016-04-29 14:47 ` [RFC PATCH 8/8] perf tools: Remove xrealloc and ALLOC_GROW Masami Hiramatsu
2016-04-29 14:54 ` [RFC PATCH 0/8] perf tools: Update strbuf to remove xrealloc Arnaldo Carvalho de Melo
2016-04-29 15:16   ` Masami Hiramatsu

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=20160429144727.24984.47674.stgit@devbox \
    --to=mhiramat@kernel.org \
    --cc=acme@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.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