Re: [PATCH 1/2] perf probe: Fix concat_probe_trace_events

[Masami Hiramatsu]

On Wed,  8 Mar 2017 12:29:07 +0530
Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxxxxxxx> wrote:

> '*ntevs' contains number of elements present in 'tevs' array. If
> there are no elements in array, 'tevs2' can be directly assigned
> to 'tevs' without allocating more space. So the condition should
> be  '*ntevs == 0'  not  'ntevs == 0'.

Oops, good catch!

Acked-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>

Thanks!

> 
> Fixes: 42bba263eb58 ("perf probe: Allow wildcard for cached events")
> Signed-off-by: Ravi Bangoria <ravi.bangoria@xxxxxxxxxxxxxxxxxx>
> ---
>  tools/perf/util/probe-event.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index 28fb62c..4f9d6ee 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -3057,7 +3057,7 @@ concat_probe_trace_events(struct probe_trace_event **tevs, int *ntevs,
>  	struct probe_trace_event *new_tevs;
>  	int ret = 0;
>  
> -	if (ntevs == 0) {
> +	if (*ntevs == 0) {
>  		*tevs = *tevs2;
>  		*ntevs = ntevs2;
>  		*tevs2 = NULL;
> -- 
> 2.9.3
> 


-- 
Masami Hiramatsu <mhiramat@xxxxxxxxxx>