Release 2.3.2

.appveyor.yml

@@ -1,4 +1,4 @@
-version: '2.3.1-git-{build}'
+version: '2.3.2-git-{build}'
 image: 'Visual Studio 2017'
 clone_depth: 1
 

CMakeLists.txt

@@ -37,7 +37,7 @@ endif()
 
 set(CUTTER_VERSION_MAJOR 2)
 set(CUTTER_VERSION_MINOR 3)
-set(CUTTER_VERSION_PATCH 1)
+set(CUTTER_VERSION_PATCH 2)
 
 set(CUTTER_VERSION "${CUTTER_VERSION_MAJOR}.${CUTTER_VERSION_MINOR}.${CUTTER_VERSION_PATCH}")
 

dist/bundle_jsdec.ps1

@@ -2,7 +2,7 @@ $dist = $args[0]
 $python = Split-Path((Get-Command python.exe).Path)
 
 if (-not (Test-Path -Path 'jsdec' -PathType Container)) {
-    git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch master
+    git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.6.0"
 }
 cd jsdec
 & meson.exe --buildtype=release -Dc_args=-DDUK_USE_DATE_NOW_WINDOWS -Djsc_folder=".." --prefix="$dist" p build

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = '2.3'
 # The full version, including a2lpha/beta/rc tags
-release = '2.3.1'
+release = '2.3.2'
 
 
 # -- General configuration ---------------------------------------------------

scripts/jsdec.sh

@@ -7,7 +7,7 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "$SCRIPTPATH/.."
 
 if [[ ! -d jsdec ]]; then
-	git clone https://github.com/rizinorg/jsdec.git --depth 2 --branch master
+	git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.6.0"
 fi
 
 cd jsdec

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;
+            }
         }
     }
 }

src/re.rizin.cutter.appdata.xml

@@ -25,6 +25,7 @@
   <update_contact>xarkes</update_contact>
 
   <releases>
+    <release version="2.3.2" date="2023-09-14" />
     <release version="2.3.1" date="2023-08-20" />
     <release version="2.3.0" date="2023-08-05" />
     <release version="2.2.1" date="2023-05-15" />