Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1398219

[PATCH 10/15] perf help: Make check_emacsclient_version to check strbuf APIs

Show all headers | View raw

From: Masami Hiramatsu <mhiramat@kernel.org>

Make check_emacsclient_version() to check the return value of strbuf
APIs so that it can handle errors in strbuf.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20160510054716.6158.11755.stgit@devbox
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-help.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index bc1de9b8fd67..f9830c902b78 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -61,6 +61,7 @@ static int check_emacsclient_version(void)
 	struct child_process ec_process;
 	const char *argv_ec[] = { "emacsclient", "--version", NULL };
 	int version;
+	int ret = -1;
 
 	/* emacsclient prints its version number on stderr */
 	memset(&ec_process, 0, sizeof(ec_process));
@@ -71,7 +72,10 @@ static int check_emacsclient_version(void)
 		fprintf(stderr, "Failed to start emacsclient.\n");
 		return -1;
 	}
-	strbuf_read(&buffer, ec_process.err, 20);
+	if (strbuf_read(&buffer, ec_process.err, 20) < 0) {
+		fprintf(stderr, "Failed to read emacsclient version\n");
+		goto out;
+	}
 	close(ec_process.err);
 
 	/*
@@ -82,8 +86,7 @@ static int check_emacsclient_version(void)
 
 	if (prefixcmp(buffer.buf, "emacsclient")) {
 		fprintf(stderr, "Failed to parse emacsclient version.\n");
-		strbuf_release(&buffer);
-		return -1;
+		goto out;
 	}
 
 	version = atoi(buffer.buf + strlen("emacsclient"));
@@ -92,12 +95,11 @@ static int check_emacsclient_version(void)
 		fprintf(stderr,
 			"emacsclient version '%d' too old (< 22).\n",
 			version);
-		strbuf_release(&buffer);
-		return -1;
-	}
-
+	} else
+		ret = 0;
+out:
 	strbuf_release(&buffer);
-	return 0;
+	return ret;
 }
 
 static void exec_woman_emacs(const char *path, const char *page)
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/15] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 09/15] perf probe: Check the return value of strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 04/15] perf tools: Support reading from backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 15/15] perf tools: Remove xrealloc and ALLOC_GROW Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 03/15] perf script: Fix incorrect python db-export error message Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 11/15] perf tools: Make alias handler to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 14/15] perf help: Do not use ALLOC_GROW in add_cmd_list Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 07/15] perf symbols: Fix handling of zero-length symbols. Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 12/15] perf header: Make topology checkers to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 05/15] perf tests: Add test to check backward ring buffer Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 01/15] perf callchain: Recording 'dwarf' callchains do not need DWARF unwinding support Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 06/15] perf evsel: Print state of perf_event_attr.write_backward Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 10/15] perf help: Make check_emacsclient_version to check strbuf APIs Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:20 +0200
  [PATCH 08/15] perf tools: Rewrite strbuf not to die() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 02/15] perf stat: Scale values by unit before metrics Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  [PATCH 13/15] perf pmu: Make pmu_formats_string to check return value of strbuf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-05-10 17:30 +0200
  Re: [GIT PULL 00/15] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-05-10 22:30 +0200

csiph-web