Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rizin to latest dev #3292

Merged
merged 2 commits into from
Feb 13, 2024
Merged

Update rizin to latest dev #3292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9796da8
Update rizin to latest dev
XVilka Feb 13, 2024
bce21c1
Use jsdec for rizin 0.7.0
wargio Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dist/bundle_jsdec.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rizin
Open in desktop
Submodule rizin updated 403 files
15 changes: 8 additions & 7 deletions scripts/jsdec.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion src/common/Decompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions src/core/Cutter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3430,7 +3430,7 @@ QList<SectionDescription> 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 &sect : CutterPVector<RzBinSection>(sects)) {
if (RZ_STR_ISEMPTY(sect->name))
continue;
Expand Down Expand Up @@ -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);
Expand Down
Loading