mirror of
https://github.com/rizinorg/cutter.git
synced 2024-12-18 10:56:11 +00:00
Update rizin to latest dev & update jsdec to v0.7.0 (#3292)
* Update rizin to latest dev * Use jsdec for rizin 0.7.0 --------- Co-authored-by: wargio <wargio@libero.it>
This commit is contained in:
parent
e7a5931c76
commit
f97ab44072
4
dist/bundle_jsdec.ps1
vendored
4
dist/bundle_jsdec.ps1
vendored
@ -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"
|
||||
|
2
rizin
2
rizin
@ -1 +1 @@
|
||||
Subproject commit ce88bbed49d1142fa33a57afee2ccfa62694f23b
|
||||
Subproject commit fa455f8b5244ad0cebe2fa8aca1c71096f55dfa1
|
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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 § : CutterPVector<RzBinSection>(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);
|
||||
|
Loading…
Reference in New Issue
Block a user