ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use r2 c api for reading comments. (#2154)

Browse Source 
C api allows specifying address directly thus avoiding unnecesarry reads
caused by seek(rb=true).
This commit is contained in:
karliss 2020-04-16 20:31:15 +03:00 committed by GitHub
parent 8957e5eb64
commit ccb53fedbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/Cutter.cpp
View File

@ -117,6 +117,12 @@ static void updateOwnedCharPtr(char *&variable, const QString &newValue)
variable = strdup(data.data()); variable = strdup(data.data());
} }
static QString fromOwnedCharPtr(char *str) {
QString result(str ? str : "");
r_mem_free(str);
return result;
}
RCoreLocked::RCoreLocked(CutterCore *core) RCoreLocked::RCoreLocked(CutterCore *core)
: core(core) : core(core)
{ {
@ -329,8 +335,7 @@ QString CutterCore::cmd(const char *str)
RVA offset = core->offset; RVA offset = core->offset;
char *res = r_core_cmd_str(core, str); char *res = r_core_cmd_str(core, str);
QString o = QString(res ? res : ""); QString o = fromOwnedCharPtr(res);
r_mem_free(res);
if (offset != core->offset) { if (offset != core->offset) {
updateSeek(); updateSeek();
@ -782,7 +787,8 @@ void CutterCore::delComment(RVA addr)
*/ */
QString CutterCore::getCommentAt(RVA addr) QString CutterCore::getCommentAt(RVA addr)
{ {
return Core()->cmdRawAt("CC.", addr); CORE_LOCK();
return fromOwnedCharPtr(r_meta_get_string(core->anal, R_META_TYPE_COMMENT, addr));
} }
void CutterCore::setImmediateBase(const QString &r2BaseName, RVA offset) void CutterCore::setImmediateBase(const QString &r2BaseName, RVA offset)
@ -3484,8 +3490,7 @@ QString CutterCore::listFlagsAsStringAt(RVA addr)
{ {
CORE_LOCK(); CORE_LOCK();
char *flagList = r_flag_get_liststr (core->flags, addr); char *flagList = r_flag_get_liststr (core->flags, addr);
QString result(flagList); QString result = fromOwnedCharPtr(flagList);
r_mem_free(flagList);
return result; return result;
} }