From 8c03b14290ff8779e7c48b035a33cf7589a69e35 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Mon, 25 Dec 2023 21:22:06 +0800 Subject: [PATCH] Update Rizin to the latest dev (#3278) --- rizin | 2 +- src/core/Cutter.cpp | 2 +- src/core/RizinCpp.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rizin b/rizin index b9851b7c..286d9bd8 160000 --- a/rizin +++ b/rizin @@ -1 +1 @@ -Subproject commit b9851b7c24ab5d3cc2d0192d4b8f8859cad2999c +Subproject commit 286d9bd874bfbe1e782cba901e59984d708d10af diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp index 4a1ae79c..43ba9bab 100644 --- a/src/core/Cutter.cpp +++ b/src/core/Cutter.cpp @@ -1666,7 +1666,7 @@ QVector CutterCore::getHeapChunks(RVA arena_addr) rz_list_free(arenas); return chunks_vector; } - m_arena = ((RzArenaListItem *)arenas->head->data)->addr; + m_arena = ((RzArenaListItem *)arenas->head->elem)->addr; rz_list_free(arenas); } else { m_arena = arena_addr; diff --git a/src/core/RizinCpp.h b/src/core/RizinCpp.h index 85381717..6399e145 100644 --- a/src/core/RizinCpp.h +++ b/src/core/RizinCpp.h @@ -55,7 +55,7 @@ static inline auto fromOwned(RZ_OWN RzList *data) -> UniquePtrCPhead; it && ((x = static_cast(it->data))); it = it->n) + for (it = list->head; it && ((x = static_cast(it->elem))); it = it->next) #define CutterRzVectorForeach(vec, it, type) \ if ((vec) && (vec)->a) \ @@ -133,7 +133,7 @@ public: if (!iter) { return *this; } - iter = iter->n; + iter = iter->next; return *this; } iterator operator++(int) @@ -149,7 +149,7 @@ public: if (!iter) { return nullptr; } - return reinterpret_cast(iter->data); + return reinterpret_cast(iter->elem); } };