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

Fix strings list #322

Browse Source
This commit is contained in:
xarkes 2018-02-10 18:50:00 +01:00
parent 5d1bf80b5b
commit bc8b890557
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cutter.cpp
View File

@ -1054,22 +1054,20 @@ QList<RelocDescription> CutterCore::getAllRelocs()
QList<StringDescription> CutterCore::getAllStrings() QList<StringDescription> CutterCore::getAllStrings()
{ {
CORE_LOCK(); CORE_LOCK();
RListIter *it;
QList<StringDescription> ret; QList<StringDescription> ret;
QJsonArray stringsArray = cmdj("izzj")["strings"].toArray();
RBinString *bs; for (QJsonValue value : stringsArray)
if (core_ && core_->bin && core_->bin->cur && core_->bin->cur->o)
{ {
CutterRListForeach(core_->bin->cur->o->strings, it, RBinString, bs) QJsonObject stringObject = value.toObject();
{
StringDescription str; StringDescription string;
str.vaddr = bs->vaddr; string.string = QString(QByteArray::fromBase64(stringObject["string"].toVariant().toByteArray()));
str.string = bs->string; string.vaddr = stringObject["vaddr"].toVariant().toULongLong();
str.type = bs->type; string.type = stringObject["type"].toString();
str.length = bs->length; string.size = stringObject["size"].toVariant().toUInt();
str.size = bs->size; string.length = stringObject["length"].toVariant().toUInt();
ret << str;
} ret << string;
} }
return ret; return ret;

7
src/widgets/StringsWidget.cpp
View File

@ -41,12 +41,7 @@ QVariant StringsModel::data(const QModelIndex &index, int role) const
case STRING: case STRING:
return str.string; return str.string;
case TYPE: case TYPE:
if (str.type == "a") return str.type.toUpper();
return "ASCII";
else if (str.type == "u")
return "UTF-8";
else
return str.type;
case LENGTH: case LENGTH:
return str.length; return str.length;
case SIZE: case SIZE: