diff --git a/dist/bundle_jsdec.ps1 b/dist/bundle_jsdec.ps1 index a25d6ae6..64466a7c 100644 --- a/dist/bundle_jsdec.ps1 +++ b/dist/bundle_jsdec.ps1 @@ -2,10 +2,10 @@ $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 "v0.6.0" + git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.7.0" } 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 $ErrorActionPreference = 'Stop' $pathdll = "$dist\lib\rizin\plugins\core_pdd.dll" diff --git a/rizin b/rizin index ce88bbed..fa455f8b 160000 --- a/rizin +++ b/rizin @@ -1 +1 @@ -Subproject commit ce88bbed49d1142fa33a57afee2ccfa62694f23b +Subproject commit fa455f8b5244ad0cebe2fa8aca1c71096f55dfa1 diff --git a/scripts/jsdec.sh b/scripts/jsdec.sh index 966c605a..c084133c 100755 --- a/scripts/jsdec.sh +++ b/scripts/jsdec.sh @@ -6,14 +6,15 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")") cd "$SCRIPTPATH/.." -if [[ ! -d jsdec ]]; then - git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.6.0" +if [ ! -d jsdec ]; then + git clone https://github.com/rizinorg/jsdec.git --depth 1 --branch "v0.7.0" fi cd jsdec -rm -rf build -mkdir build && cd build -meson --buildtype=release -Djsc_folder="../" "$@" ../p -ninja -ninja install +if [ -d build ]; then + rm -rf build +fi +meson --buildtype=release "$@" build +ninja -C build +ninja -C build install diff --git a/src/common/Decompiler.cpp b/src/common/Decompiler.cpp index 1868e4e4..2d9478e5 100644 --- a/src/common/Decompiler.cpp +++ b/src/common/Decompiler.cpp @@ -16,7 +16,7 @@ static char *jsonToStrdup(const CutterJson &str) if (!j || j->type != RZ_JSON_STRING) { return NULL; } - return rz_str_new(j->str_value); + return rz_str_dup(j->str_value); } static RzAnnotatedCode *parseJsonCode(CutterJson &json) diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp index baaa8410..47fc607d 100644 --- a/src/core/Cutter.cpp +++ b/src/core/Cutter.cpp @@ -3430,7 +3430,7 @@ QList CutterCore::getAllSections() if (!hashnames) { return sections; } - rz_list_push(hashnames, rz_str_new("entropy")); + rz_list_push(hashnames, rz_str_dup("entropy")); for (const auto § : CutterPVector(sects)) { if (RZ_STR_ISEMPTY(sect->name)) continue; @@ -3778,8 +3778,8 @@ void CutterCore::setAnalysisMethod(const QString &className, const AnalysisMetho { CORE_LOCK(); RzAnalysisMethod analysisMeth; - analysisMeth.name = rz_str_new(meth.name.toUtf8().constData()); - analysisMeth.real_name = rz_str_new(meth.realName.toUtf8().constData()); + analysisMeth.name = rz_str_dup(meth.name.toUtf8().constData()); + analysisMeth.real_name = rz_str_dup(meth.realName.toUtf8().constData()); analysisMeth.addr = meth.addr; analysisMeth.vtable_offset = meth.vtableOffset; rz_analysis_class_method_set(core->analysis, className.toUtf8().constData(), &analysisMeth);