Commit 230a7a71 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

libsubcmd: Fix parse-options memory leak 



If a usage string is built in parse_options_subcommand, also free it.

Fixes: 901421a5 ("perf tools: Remove subcmd dependencies on strbuf")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20240509052015.1914670-1-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5ecab785

tools/lib/subcmd/parse-options.c

+5 −3
Original line number Diff line number Diff line
@@ -633,11 +633,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o 
			const char *const subcommands[], const char *usagestr[], int flags)

{

	struct parse_opt_ctx_t ctx;

	char *buf = NULL;



	/* build usage string if it's not provided */

	if (subcommands && !usagestr[0]) {

		char *buf = NULL;



		astrcatf(&buf, "%s %s [<options>] {", subcmd_config.exec_name, argv[0]);



		for (int i = 0; subcommands[i]; i++) {
@@ -679,7 +678,10 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o 
			astrcatf(&error_buf, "unknown switch `%c'", *ctx.opt);

		usage_with_options(usagestr, options);

	}



	if (buf) {

		usagestr[0] = NULL;

		free(buf);

	}

	return parse_options_end(&ctx);

}