From c4dd2eda7d7a219415bb5e090b845c8bfdeb69e5 Mon Sep 17 00:00:00 2001
From: Giovanni <561184+wargio@users.noreply.github.com>
Date: Fri, 29 Dec 2023 15:17:36 +0800
Subject: [PATCH] Update rizin, translation to latest dev and fix deadlock
 (#3279)

---
 rizin               |  2 +-
 src/core/Cutter.cpp | 10 +++++-----
 src/translations    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rizin b/rizin
index 286d9bd8..ccbfe57b 160000
--- a/rizin
+++ b/rizin
@@ -1 +1 @@
-Subproject commit 286d9bd874bfbe1e782cba901e59984d708d10af
+Subproject commit ccbfe57b683f247f9b73835a1c46f50627ba4edd
diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index 43ba9bab..be3f8f7a 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -722,7 +722,7 @@ PRzAnalysisBytes CutterCore::getRzAnalysisBytesSingle(RVA addr)
     rz_io_read_at(core->io, addr, buf, sizeof(buf));
 
     auto seek = seekTemp(addr);
-    auto vec = fromOwned(rz_core_analysis_bytes(core, buf, sizeof(buf), 1));
+    auto vec = fromOwned(rz_core_analysis_bytes(core, addr, buf, sizeof(buf), 1));
 
     auto ab = vec && rz_pvector_len(vec.get()) > 0
             ? reinterpret_cast<RzAnalysisBytes *>(rz_pvector_pop_front(vec.get()))
@@ -1027,8 +1027,8 @@ RVA CutterCore::nextOpAddr(RVA startAddr, int count)
 {
     CORE_LOCK();
     auto seek = seekTemp(startAddr);
-    auto vec =
-            fromOwned(rz_core_analysis_bytes(core, core->block, (int)core->blocksize, count + 1));
+    auto vec = fromOwned(rz_core_analysis_bytes(core, core->offset, core->block,
+                                                (int)core->blocksize, count + 1));
 
     RVA addr = startAddr + 1;
     if (!vec) {
@@ -1666,7 +1666,7 @@ QVector<Chunk> CutterCore::getHeapChunks(RVA arena_addr)
             rz_list_free(arenas);
             return chunks_vector;
         }
-        m_arena = ((RzArenaListItem *)arenas->head->elem)->addr;
+        m_arena = ((RzArenaListItem *)rz_list_get_head_data(arenas))->addr;
         rz_list_free(arenas);
     } else {
         m_arena = arena_addr;
@@ -2793,7 +2793,7 @@ int CutterCore::breakpointIndexAt(RVA addr)
 BreakpointDescription CutterCore::getBreakpointAt(RVA addr)
 {
     CORE_LOCK();
-    int index = breakpointIndexAt(addr);
+    int index = rz_bp_get_index_at(core->dbg->bp, addr);
     auto bp = rz_bp_get_index(core->dbg->bp, index);
     if (bp) {
         return breakpointDescriptionFromRizin(index, bp);
diff --git a/src/translations b/src/translations
index 10528baf..30267d0a 160000
--- a/src/translations
+++ b/src/translations
@@ -1 +1 @@
-Subproject commit 10528baf7920bfa39c5aeb06a433e4d60814e53f
+Subproject commit 30267d0acd528cbdbe2911e562085f7385e5ac47