From 59872e9fbfc58fb7ac32f85fb0a261130550886b Mon Sep 17 00:00:00 2001 From: Giovanni <561184+wargio@users.noreply.github.com> Date: Fri, 18 Aug 2023 10:57:05 +0800 Subject: [PATCH 1/5] Use tags for jsdec instead of master. (#3231) --- dist/bundle_jsdec.ps1 | 2 +- scripts/jsdec.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/bundle_jsdec.ps1 b/dist/bundle_jsdec.ps1 index d6162346db..a25d6ae62e 100644 --- a/dist/bundle_jsdec.ps1 +++ b/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 diff --git a/scripts/jsdec.sh b/scripts/jsdec.sh index caee07594d..966c605a7c 100755 --- a/scripts/jsdec.sh +++ b/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 From 96bd165157dab5cfb58e2eb9f6e3cd77bd1ffd95 Mon Sep 17 00:00:00 2001 From: frmdstryr Date: Mon, 4 Sep 2023 10:52:07 -0400 Subject: [PATCH 2/5] Seek to first call if multiple references (#3240) --- src/common/CutterSeekable.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/common/CutterSeekable.cpp b/src/common/CutterSeekable.cpp index 12ef7b7b82..bba7c3178e 100644 --- a/src/common/CutterSeekable.cpp +++ b/src/common/CutterSeekable.cpp @@ -65,7 +65,6 @@ void CutterSeekable::seekToReference(RVA offset) return; } - RVA target; QList refs = Core()->getXRefs(offset, false, false); if (refs.length()) { @@ -73,10 +72,19 @@ void CutterSeekable::seekToReference(RVA offset) 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; + } } } } From 15cc2c02edb9aec370184ff7b2068f3ebdc98c39 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Thu, 14 Sep 2023 12:49:24 +0800 Subject: [PATCH 3/5] Update translations --- src/translations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations b/src/translations index 5c7c3bb645..0c92dc939a 160000 --- a/src/translations +++ b/src/translations @@ -1 +1 @@ -Subproject commit 5c7c3bb645e3d9dfc6e93ddfa1355be3bc76acb5 +Subproject commit 0c92dc939a0aa74e6b5c8770bf50aa5719e4de2b From b2ee6f1cb83d8ec2275faf0960bee5a59a91af2a Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Thu, 14 Sep 2023 12:50:15 +0800 Subject: [PATCH 4/5] Update rizin to v0.6.2 --- rizin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rizin b/rizin index d9af48b56e..18b1243435 160000 --- a/rizin +++ b/rizin @@ -1 +1 @@ -Subproject commit d9af48b56e47afadd1a77e74c12099efd5e8e19e +Subproject commit 18b1243435df428b58bcefc4ec37aef558aab96e From 078a8df00fa1320a492d088840e0f8de0be9f358 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Thu, 14 Sep 2023 12:53:05 +0800 Subject: [PATCH 5/5] Bump version to v2.3.2 --- .appveyor.yml | 2 +- CMakeLists.txt | 2 +- docs/source/conf.py | 2 +- src/re.rizin.cutter.appdata.xml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 45b94c776c..49221f5c1f 100644 --- a/.appveyor.yml +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 85bc53e4fe..2b07860e44 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/docs/source/conf.py b/docs/source/conf.py index fc157a45ad..043c6d6fba 100644 --- a/docs/source/conf.py +++ b/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 --------------------------------------------------- diff --git a/src/re.rizin.cutter.appdata.xml b/src/re.rizin.cutter.appdata.xml index a0c1dd8fd5..ab7a64136e 100644 --- a/src/re.rizin.cutter.appdata.xml +++ b/src/re.rizin.cutter.appdata.xml @@ -25,6 +25,7 @@ xarkes +