ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update rizin to latest dev & update jsdec to v0.7.0 (#3292)

Browse Source 
* Update rizin to latest dev
* Use jsdec for rizin 0.7.0

---------

Co-authored-by: wargio <wargio@libero.it>
This commit is contained in:
Anton Kochkov 2024-02-13 22:54:02 +08:00 committed by GitHub
parent e7a5931c76
commit f97ab44072
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/bundle_jsdec.ps1 vendored
View File

@ -2,10 +2,10 @@ $dist = $args[0]
$python = Split-Path((Get-Command python.exe).Path) $python = Split-Path((Get-Command python.exe).Path)
if (-not (Test-Path -Path 'jsdec' -PathType Container)) { if (-not (Test-Path -Path 'jsdec' -PathType Container)) {
git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.6.0" git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.7.0"
} }
cd jsdec cd jsdec
& meson.exe --buildtype=release -Dc_args=-DDUK_USE_DATE_NOW_WINDOWS -Djsc_folder=".." --prefix="$dist" p build & meson.exe --buildtype=release --prefix="$dist" build
ninja -C build install ninja -C build install
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$pathdll = "$dist\lib\rizin\plugins\core_pdd.dll" $pathdll = "$dist\lib\rizin\plugins\core_pdd.dll"

2
rizin

@ -1 +1 @@
Subproject commit ce88bbed49d1142fa33a57afee2ccfa62694f23b Subproject commit fa455f8b5244ad0cebe2fa8aca1c71096f55dfa1

15
scripts/jsdec.sh
View File

@ -6,14 +6,15 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
cd "$SCRIPTPATH/.." cd "$SCRIPTPATH/.."
if [[ ! -d jsdec ]]; then if [ ! -d jsdec ]; then
git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.6.0" git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.7.0"
fi fi
cd jsdec cd jsdec
rm -rf build if [ -d build ]; then
mkdir build && cd build rm -rf build
meson --buildtype=release -Djsc_folder="../" "$@" ../p fi
ninja meson --buildtype=release "$@" build
ninja install ninja -C build
ninja -C build install

2
src/common/Decompiler.cpp
View File

@ -16,7 +16,7 @@ static char *jsonToStrdup(const CutterJson &str)
if (!j || j->type != RZ_JSON_STRING) { if (!j || j->type != RZ_JSON_STRING) {
return NULL; return NULL;
} }
return rz_str_new(j->str_value); return rz_str_dup(j->str_value);
} }
static RzAnnotatedCode *parseJsonCode(CutterJson &json) static RzAnnotatedCode *parseJsonCode(CutterJson &json)

6
src/core/Cutter.cpp
View File

@ -3430,7 +3430,7 @@ QList<SectionDescription> CutterCore::getAllSections()
if (!hashnames) { if (!hashnames) {
return sections; return sections;
} }
rz_list_push(hashnames, rz_str_new("entropy")); rz_list_push(hashnames, rz_str_dup("entropy"));
for (const auto &sect : CutterPVector<RzBinSection>(sects)) { for (const auto &sect : CutterPVector<RzBinSection>(sects)) {
if (RZ_STR_ISEMPTY(sect->name)) if (RZ_STR_ISEMPTY(sect->name))
continue; continue;
@ -3778,8 +3778,8 @@ void CutterCore::setAnalysisMethod(const QString &className, const AnalysisMetho
{ {
CORE_LOCK(); CORE_LOCK();
RzAnalysisMethod analysisMeth; RzAnalysisMethod analysisMeth;
analysisMeth.name = rz_str_new(meth.name.toUtf8().constData()); analysisMeth.name = rz_str_dup(meth.name.toUtf8().constData());
analysisMeth.real_name = rz_str_new(meth.realName.toUtf8().constData()); analysisMeth.real_name = rz_str_dup(meth.realName.toUtf8().constData());
analysisMeth.addr = meth.addr; analysisMeth.addr = meth.addr;
analysisMeth.vtable_offset = meth.vtableOffset; analysisMeth.vtable_offset = meth.vtableOffset;
rz_analysis_class_method_set(core->analysis, className.toUtf8().constData(), &analysisMeth); rz_analysis_class_method_set(core->analysis, className.toUtf8().constData(), &analysisMeth);