archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 22:41:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a segfault in memory viewer

Browse source 
Also a memory leak.
This commit is contained in:
Eladash 2020-03-19 06:52:43 +02:00 • committed by Ivan
parent 7139c4fbab
commit e3668cc26c
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -1,5 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Memory/vm.h" #include "Utilities/mutex.h"
#include "Emu/Memory/vm_locking.h"
#include "memory_viewer_panel.h" #include "memory_viewer_panel.h"
@ -10,6 +11,7 @@
#include <QTextEdit> #include <QTextEdit>
#include <QComboBox> #include <QComboBox>
#include <QWheelEvent> #include <QWheelEvent>
#include <shared_mutex>
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;
@ -273,10 +275,9 @@ void memory_viewer_panel::ShowMemory()
if (vm::check_addr(addr)) if (vm::check_addr(addr))
{ {
const u8 rmem = vm::read8(addr); const u8 rmem = *vm::get_super_ptr<u8>(addr);
t_mem_hex_str += qstr(fmt::format("%02x ", rmem)); t_mem_hex_str += qstr(fmt::format("%02x ", rmem));
const bool isPrintable = rmem >= 32 && rmem <= 126; t_mem_ascii_str += qstr(std::string(1, std::isprint(rmem) ? static_cast<char>(rmem) : '.'));
t_mem_ascii_str += qstr(isPrintable ? std::string(1, rmem) : ".");
} }
else else
{ {
@ -314,8 +315,15 @@ void memory_viewer_panel::SetPC(const uint pc)
void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, int mode, u32 width, u32 height, bool flipv) void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, int mode, u32 width, u32 height, bool flipv)
{ {
uchar* originalBuffer = static_cast<uchar*>(vm::base(addr)); std::shared_lock rlock(vm::g_mutex);
uchar* convertedBuffer = static_cast<uchar*>(std::malloc(width * height * 4));
if (!vm::check_addr(addr, width * height * 4))
{
return;
}
const auto originalBuffer = vm::get_super_ptr<const uchar>(addr);
const auto convertedBuffer = static_cast<uchar*>(std::malloc(width * height * 4));
switch(mode) switch(mode)
{ {
@ -372,6 +380,8 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, int mode, u32 wid
break; break;
} }
rlock.unlock();
// Flip vertically // Flip vertically
if (flipv) if (flipv)
{ {
@ -386,7 +396,7 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, int mode, u32 wid
} }
} }
QImage image = QImage(convertedBuffer, width, height, QImage::Format_ARGB32); QImage image = QImage(convertedBuffer, width, height, QImage::Format_ARGB32, [](void* buffer){ std::free(buffer); }, convertedBuffer);
if (image.isNull()) return; if (image.isNull()) return;
QLabel* canvas = new QLabel(); QLabel* canvas = new QLabel();