Re: [PATCH] perf session: Fix possible null pointer dereference in session.c

[Jiri Olsa <jolsa@redhat.com>]

On Thu, May 15, 2014 at 02:13:38AM +0900, Masanari Iida wrote:
> cppcheck detected following warning.
> [tools/perf/util/session.c:1628] -> [tools/perf/util/session.c:1632]:
>  (warning) Possible null pointer dereference: session - otherwise it
>  is redundant to check it against null.
> 
> In order to avoide null pointer, check the pointer before use.
> 
> Signed-off-by: Masanari Iida <standby24x7@gmail.com>

applied, thanks

jirka

> ---
>  tools/perf/util/session.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
> index 55960f2..64a186e 100644
> --- a/tools/perf/util/session.c
> +++ b/tools/perf/util/session.c
> @@ -1625,13 +1625,14 @@ out_delete_map:
>  void perf_session__fprintf_info(struct perf_session *session, FILE *fp,
>  				bool full)
>  {
> -	int fd = perf_data_file__fd(session->file);
>  	struct stat st;
> -	int ret;
> +	int fd, ret;
>  
>  	if (session == NULL || fp == NULL)
>  		return;
>  
> +	fd = perf_data_file__fd(session->file);
> +
>  	ret = fstat(fd, &st);
>  	if (ret == -1)
>  		return;
> -- 
> 2.0.0.rc3.2.g998f840
>