From f2e00c59c813170ee8af0ee95fb18bccb0814c33 Mon Sep 17 00:00:00 2001
From: wargio <wargio@libero.it>
Date: Sat, 18 Feb 2023 21:12:27 +0800
Subject: [PATCH] Fix #3113 - Wrong usage of rz_cmd_call instead of rz_core_cmd
 and @!

---
 src/core/Cutter.cpp           | 5 ++---
 src/widgets/HexdumpWidget.cpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index dc585dd4..8a721109 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -475,8 +475,8 @@ QString CutterCore::cmdRaw(const char *cmd)
     CORE_LOCK();
     rz_cons_push();
 
-    // rz_cmd_call does not return the output of the command
-    rz_cmd_call(core->rcmd, cmd);
+    // rz_core_cmd does not return the output of the command
+    rz_core_cmd(core, cmd, 0);
 
     // we grab the output straight from rz_cons
     res = rz_cons_get_buffer();
@@ -4494,7 +4494,6 @@ QByteArray CutterCore::ioRead(RVA addr, int len)
     /* Zero-copy */
     array.resize(len);
     if (!rz_io_read_at(core->io, addr, (uint8_t *)array.data(), len)) {
-        qWarning() << "Can't read data" << addr << len;
         array.fill(0xff);
     }
 
diff --git a/src/widgets/HexdumpWidget.cpp b/src/widgets/HexdumpWidget.cpp
index e6a088c4..7b5d1acd 100644
--- a/src/widgets/HexdumpWidget.cpp
+++ b/src/widgets/HexdumpWidget.cpp
@@ -240,7 +240,7 @@ void HexdumpWidget::updateParseWindow(RVA start_address, int size)
 
         ui->hexDisasTextEdit->setPlainText(
                 selectedCommand != "" ? Core()->cmdRawAt(
-                        QString("%1 %2").arg(selectedCommand).arg(size), start_address)
+                        QString("%1 @! %2").arg(selectedCommand).arg(size), start_address)
                                       : "");
     } else {
         // Fill the information tab hashes and entropy