---

yaml --- r: 277343 b: refs/heads/master c: cb8f4e9 h: refs/heads/master i: 277341: 671c8ea 277339: 60d7ff3 277335: a5cc931 277327: 848e66f 277311: 1d5ae95 v: v3
git-mirror · Dec 20, 2011 · 920aa64 · 920aa64
1 parent 0e45d84
commit 920aa64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f9273d64a5ccbd3c2b4446cc8b71123ed5d6366
+refs/heads/master: cb8f4e9aa37c469ddd80dda51469f327606c0118
diff --git a/trunk/tools/perf/util/event.c b/trunk/tools/perf/util/event.c
@@ -814,13 +814,14 @@ int perf_event__preprocess_sample(const union perf_event *event,
 	al->cpu = sample->cpu;
 
 	if (al->map) {
+		struct dso *dso = al->map->dso;
+
 		if (symbol_conf.dso_list &&
-		    (!al->map || !al->map->dso ||
-		     !(strlist__has_entry(symbol_conf.dso_list,
-					  al->map->dso->short_name) ||
-		       (al->map->dso->short_name != al->map->dso->long_name &&
-			strlist__has_entry(symbol_conf.dso_list,
-					   al->map->dso->long_name)))))
+		    (!dso || !(strlist__has_entry(symbol_conf.dso_list,
+						  dso->short_name) ||
+			       (dso->short_name != dso->long_name &&
+				strlist__has_entry(symbol_conf.dso_list,
+						   dso->long_name)))))
 			goto out_filtered;
 
 		al->sym = map__find_symbol(al->map, al->addr, filter);