---

yaml --- r: 156743 b: refs/heads/master c: 8fd101f h: refs/heads/master i: 156741: d5e1571 156739: dbec462 156735: af7a226 v: v3
git-mirror · Aug 13, 2009 · 6d56c81 · 6d56c81
1 parent 268a524
commit 6d56c81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daac07b2e6b77f1bd44104aa2f0593e5505f27d4
+refs/heads/master: 8fd101f20bdf771949a8f3a5a779877d09b2fb56
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
@@ -1590,10 +1590,11 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
 	if (show & show_mask) {
 		struct symbol *sym = resolve_symbol(thread, &map, &dso, &ip);
 
-		if (dso_list && dso && dso->name && !strlist__has_entry(dso_list, dso->name))
+		if (dso_list && (!dso || !dso->name ||
+				 !strlist__has_entry(dso_list, dso->name)))
 			return 0;
 
-		if (sym_list && sym && !strlist__has_entry(sym_list, sym->name))
+		if (sym_list && (!sym || !strlist__has_entry(sym_list, sym->name)))
 			return 0;
 
 		if (hist_entry__add(thread, map, dso, sym, ip, chain, level, period)) {