From 4dc4982b3fbdbd9b1b969faf295e528f7f54c0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Sat, 23 Nov 2019 16:03:23 +0100 Subject: [PATCH] Update radare2 and fix Strings (#1885) * Update radare2 * Fix Strings after izzj changes in r2 --- radare2 | 2 +- src/core/Cutter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radare2 b/radare2 index f6036ffb..dce959d2 160000 --- a/radare2 +++ b/radare2 @@ -1 +1 @@ -Subproject commit f6036ffbad238a61561da89b70521e8e392f7665 +Subproject commit dce959d2af4dd58038c63002d624aef5d7cce6f4 diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp index 05e62d08..ee30b8a3 100644 --- a/src/core/Cutter.cpp +++ b/src/core/Cutter.cpp @@ -1878,7 +1878,7 @@ QList CutterCore::parseStringsJson(const QJsonDocument &doc) StringDescription string; - string.string = QString(QByteArray::fromBase64(stringObject[RJsonKey::string].toVariant().toByteArray())); + string.string = stringObject[RJsonKey::string].toString(); string.vaddr = stringObject[RJsonKey::vaddr].toVariant().toULongLong(); string.type = stringObject[RJsonKey::type].toString(); string.size = stringObject[RJsonKey::size].toVariant().toUInt();