---

yaml --- r: 323805 b: refs/heads/master c: bdde371 h: refs/heads/master i: 323803: 994dfb3 v: v3
git-mirror · Sep 11, 2012 · 6e83364 · 6e83364
1 parent a7dd71d
commit 6e83364
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ac3e487f0eeef0fa058d72da7681398cc052ee9
+refs/heads/master: bdde37163e1fd474509aab90f5eaacee46100107
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
@@ -388,6 +388,11 @@ int machine__resolve_callchain(struct machine *machine,
 	      (evsel->attr.sample_type & PERF_SAMPLE_STACK_USER)))
 		return 0;
 
+	/* Bail out if nothing was captured. */
+	if ((!sample->user_regs.regs) ||
+	    (!sample->user_stack.size))
+		return 0;
+
 	return unwind__get_entries(unwind_entry, &callchain_cursor, machine,
 				   thread, evsel->attr.sample_regs_user,
 				   sample);