Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755242Ab2HNCDs (ORCPT ); Mon, 13 Aug 2012 22:03:48 -0400 Received: from LGEMRELSE7Q.lge.com ([156.147.1.151]:63288 "EHLO LGEMRELSE7Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755143Ab2HNCDq (ORCPT ); Mon, 13 Aug 2012 22:03:46 -0400 X-AuditID: 9c930197-b7bb2ae0000011d9-6f-5029b2004fd6 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , LKML , Namhyung Kim , Feng Tang Subject: [PATCH] perf script: Fix a NULL pointer dereference Date: Tue, 14 Aug 2012 10:57:03 +0900 Message-Id: <1344909423-26384-1-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.2 X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1040 Lines: 33 From: Namhyung Kim If 'perf script --gen-script' was called with a perf.data which contains no tracepoint event, it'd segfault due to NULL pevent pointer. Fix it. Cc: Feng Tang Signed-off-by: Namhyung Kim --- tools/perf/util/trace-event-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 4cb7f3831f78..a5a554efeb50 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -293,7 +293,7 @@ struct event_format *trace_find_next_event(struct pevent *pevent, { static int idx; - if (!pevent->events) + if (!pevent || !pevent->events) return NULL; if (!event) { -- 1.7.11.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/