[PATCH 30/40] perf script: Remove some bogus error handling

From: Arnaldo Carvalho de Melo
Date: Wed Jul 26 2017 - 10:24:24 EST


From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

If script_desc__new() fails then the current code has a NULL
dereference. We don't actually need to do any cleanup, we can just
return NULL.

Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: kernel-janitors@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170722073610.nnsyiwdcfl6bhn4t@mwanda
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-script.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index d430ff42208a..378f76cdf923 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2199,16 +2199,11 @@ static struct script_desc *script_desc__findnew(const char *name)

s = script_desc__new(name);
if (!s)
- goto out_delete_desc;
+ return NULL;

script_desc__add(s);

return s;
-
-out_delete_desc:
- script_desc__delete(s);
-
- return NULL;
}

static const char *ends_with(const char *str, const char *suffix)
--
2.9.4