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 Dev

Browse Source
This commit is contained in:
wargio 2024-01-07 19:41:36 +08:00 committed by Anton Kochkov
parent c4dd2eda7d
commit 4f004a2442
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rizin

@ -1 +1 @@
Subproject commit ccbfe57b683f247f9b73835a1c46f50627ba4edd Subproject commit f5ca4b96310efb7e38100076580d854b5aaf3248

30
src/core/Cutter.cpp
View File

@ -3153,7 +3153,8 @@ QList<ExportDescription> CutterCore::getAllExports()
if (!bf) { if (!bf) {
return {}; return {};
} }
const RzList *symbols = rz_bin_object_get_symbols(bf->o);
const RzPVector *symbols = rz_bin_object_get_symbols(bf->o);
if (!symbols) { if (!symbols) {
return {}; return {};
} }
@ -3162,7 +3163,7 @@ QList<ExportDescription> CutterCore::getAllExports()
bool demangle = rz_config_get_b(core->config, "bin.demangle"); bool demangle = rz_config_get_b(core->config, "bin.demangle");
QList<ExportDescription> ret; QList<ExportDescription> ret;
for (const auto &symbol : CutterRzList<RzBinSymbol>(symbols)) { for (const auto &symbol : CutterPVector<RzBinSymbol>(symbols)) {
if (!(symbol->name && rz_core_sym_is_export(symbol))) { if (!(symbol->name && rz_core_sym_is_export(symbol))) {
continue; continue;
} }
@ -3187,13 +3188,15 @@ QList<ExportDescription> CutterCore::getAllExports()
QList<SymbolDescription> CutterCore::getAllSymbols() QList<SymbolDescription> CutterCore::getAllSymbols()
{ {
CORE_LOCK(); CORE_LOCK();
RzListIter *it;
QList<SymbolDescription> ret; QList<SymbolDescription> ret;
RzBinSymbol *bs; if (!(core && core->bin && core->bin->cur && core->bin->cur->o)) {
if (core && core->bin && core->bin->cur && core->bin->cur->o) { return {};
CutterRzListForeach (core->bin->cur->o->symbols, it, RzBinSymbol, bs) { }
const RzPVector *symbols = rz_bin_object_get_symbols(core->bin->cur->o);
if (symbols) {
for (const auto &bs : CutterPVector<RzBinSymbol>(symbols)) {
QString type = QString(bs->bind) + " " + QString(bs->type); QString type = QString(bs->bind) + " " + QString(bs->type);
SymbolDescription symbol; SymbolDescription symbol;
symbol.vaddr = bs->vaddr; symbol.vaddr = bs->vaddr;
@ -3202,11 +3205,13 @@ QList<SymbolDescription> CutterCore::getAllSymbols()
symbol.type = QString(bs->type); symbol.type = QString(bs->type);
ret << symbol; ret << symbol;
} }
}
const RzList *entries = rz_bin_object_get_entries(core->bin->cur->o);
if (entries) {
/* list entrypoints as symbols too */ /* list entrypoints as symbols too */
int n = 0; int n = 0;
RzBinAddr *entry; for (const auto &entry : CutterRzList<RzBinSymbol>(entries)) {
CutterRzListForeach (core->bin->cur->o->entries, it, RzBinAddr, entry) {
SymbolDescription symbol; SymbolDescription symbol;
symbol.vaddr = entry->vaddr; symbol.vaddr = entry->vaddr;
symbol.name = QString("entry") + QString::number(n++); symbol.name = QString("entry") + QString::number(n++);
@ -3341,8 +3346,9 @@ QList<StringDescription> CutterCore::getAllStrings()
if (!obj) { if (!obj) {
return {}; return {};
} }
RzList *l = rz_core_bin_whole_strings(core, bf);
if (!l) { RzPVector *strings = rz_core_bin_whole_strings(core, bf);
if (!strings) {
return {}; return {};
} }
@ -3353,7 +3359,7 @@ QList<StringDescription> CutterCore::getAllStrings()
opt.esc_double_quotes = true; opt.esc_double_quotes = true;
QList<StringDescription> ret; QList<StringDescription> ret;
for (const auto &str : CutterRzList<RzBinString>(l)) { for (const auto &str : CutterPVector<RzBinString>(strings)) {
auto section = obj ? rz_bin_get_section_at(obj, str->paddr, 0) : NULL; auto section = obj ? rz_bin_get_section_at(obj, str->paddr, 0) : NULL;
StringDescription string; StringDescription string;