1 files changed, 8 insertions, 2 deletions

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 7a9054a23c36..9402885a77f3 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -373,6 +373,9 @@ struct sort_entry sort_cpu = {
 static int64_t
 sort__dso_from_cmp(struct hist_entry *left, struct hist_entry *right)
 {
+        if (!left->branch_info || !right->branch_info)
+                return cmp_null(left->branch_info, right->branch_info);
+
         return _sort__dso_cmp(left->branch_info->from.map,
                               right->branch_info->from.map);
 }
@@ -380,8 +383,11 @@ sort__dso_from_cmp(struct hist_entry *left, struct hist_entry *right)
 static int hist_entry__dso_from_snprintf(struct hist_entry *he, char *bf,
                                     size_t size, unsigned int width)
 {
-        return _hist_entry__dso_snprintf(he->branch_info->from.map,
-                                         bf, size, width);
+        if (he->branch_info)
+                return _hist_entry__dso_snprintf(he->branch_info->from.map,
+                                                 bf, size, width);
+        else
+                return repsep_snprintf(bf, size, "%-*.*s", width, width, "N/A");
 }
 
 static int64_t