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

Fix memory leak in sdbListKeys. (#1695)

Browse Source
This commit is contained in:
karliss 2019-07-29 00:42:25 +03:00 committed by GitHub
parent 329a9b6da1
commit 5dc5fe1cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/Cutter.cpp
View File

@ -219,6 +219,12 @@ QList<QString> CutterCore::sdbList(QString path)
return list; return list;
} }
using SdbListPtr = std::unique_ptr<SdbList, decltype (&ls_free)>;
static SdbListPtr makeSdbListPtr(SdbList *list)
{
return {list, ls_free};
}
QList<QString> CutterCore::sdbListKeys(QString path) QList<QString> CutterCore::sdbListKeys(QString path)
{ {
CORE_LOCK(); CORE_LOCK();
@ -227,7 +233,7 @@ QList<QString> CutterCore::sdbListKeys(QString path)
if (root) { if (root) {
void *vsi; void *vsi;
ls_iter_t *iter; ls_iter_t *iter;
SdbList *l = sdb_foreach_list(root, false); SdbListPtr l = makeSdbListPtr(sdb_foreach_list(root, false));
ls_foreach(l, iter, vsi) { ls_foreach(l, iter, vsi) {
SdbKv *nsi = (SdbKv *)vsi; SdbKv *nsi = (SdbKv *)vsi;
list << reinterpret_cast<char *>(nsi->base.key); list << reinterpret_cast<char *>(nsi->base.key);
@ -2098,7 +2104,7 @@ QList<QString> CutterCore::getAllAnalClasses(bool sorted)
{ {
QList<QString> ret; QList<QString> ret;
SdbList *l = r_anal_class_get_all(core_->anal, sorted); SdbListPtr l = makeSdbListPtr(r_anal_class_get_all(core_->anal, sorted));
if (!l) { if (!l) {
return ret; return ret;
} }
@ -2110,7 +2116,6 @@ QList<QString> CutterCore::getAllAnalClasses(bool sorted)
auto kv = reinterpret_cast<SdbKv *>(entry); auto kv = reinterpret_cast<SdbKv *>(entry);
ret.append(QString::fromUtf8(reinterpret_cast<const char *>(kv->base.key))); ret.append(QString::fromUtf8(reinterpret_cast<const char *>(kv->base.key)));
} }
ls_free(l);
return ret; return ret;
} }