Seek to first call if multiple references (#3240)

rizinorg · Sep 14, 2023 · 359bd91 · 359bd91
1 parent 2066a4b
commit 359bd91
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/common/CutterSeekable.cpp b/src/common/CutterSeekable.cpp
@@ -65,18 +65,26 @@ void CutterSeekable::seekToReference(RVA offset)
         return;
     }
 
-    RVA target;
     QList<XrefDescription> refs = Core()->getXRefs(offset, false, false);
 
     if (refs.length()) {
         if (refs.length() > 1) {
             qWarning() << tr("More than one (%1) references here. Weird behaviour expected.")
                                   .arg(refs.length());
         }
-
-        target = refs.at(0).to;
-        if (target != RVA_INVALID) {
-            seek(target);
+        // Try first call
+        for (auto &ref : refs) {
+            if (ref.to != RVA_INVALID && ref.type == "CALL") {
+                seek(ref.to);
+                return;
+            }
+        }
+        // Fallback to first valid, if any
+        for (auto &ref : refs) {
+            if (ref.to != RVA_INVALID) {
+                seek(ref.to);
+                return;
+            }
         }
     }
 }