Messages in this thread | | | Date | Fri, 11 Jan 2013 02:17:45 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 07/10] perf sort: Check return value of strdup() |
| |
Em Thu, Dec 27, 2012 at 06:11:44PM +0900, Namhyung Kim escreveu: > From: Namhyung Kim <namhyung.kim@lge.com> > > When setup_sorting() is called, 'str' is passed to strtok_r() but it's > not checked to have a valid pointer. As strtok_r() accepts NULL > pointer on a first argument and use the third argument in that case, > it can cause a trouble since our third argument, tmp, is not > initialized.
Ok, but calling exit from here? Better to check it at the callers and propagate the error, letting things like TUI/gui exit routines to execute.
> Cc: Stephane Eranian <eranian@google.com> > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/util/sort.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c > index c02964cabdd0..9f827e25a2b5 100644 > --- a/tools/perf/util/sort.c > +++ b/tools/perf/util/sort.c > @@ -552,6 +552,11 @@ void setup_sorting(const char * const usagestr[], const struct option *opts) > { > char *tmp, *tok, *str = strdup(sort_order); > > + if (str == NULL) { > + error("Not enough memory to setup sort keys"); > + exit(-1); > + } > + > for (tok = strtok_r(str, ", ", &tmp); > tok; tok = strtok_r(NULL, ", ", &tmp)) { > if (sort_dimension__add(tok) < 0) { > -- > 1.7.11.7
| |