From cc1b4e695d7b18a38a30055b5fdffd7b5c5ac313 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 7 Feb 2021 19:10:08 -0800 Subject: [PATCH] Debugger: Correct crash with no alloc tag. --- Core/Util/BlockAllocator.cpp | 2 +- GPU/Debugger/Playback.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/Util/BlockAllocator.cpp b/Core/Util/BlockAllocator.cpp index 76ac5b03d1..696a43513d 100644 --- a/Core/Util/BlockAllocator.cpp +++ b/Core/Util/BlockAllocator.cpp @@ -489,7 +489,7 @@ BlockAllocator::Block::Block(u32 _start, u32 _size, bool _taken, Block *_prev, B } void BlockAllocator::Block::SetAllocated(const char *_tag, bool suballoc) { - NotifyMemInfo(suballoc ? MemBlockFlags::SUB_ALLOC : MemBlockFlags::ALLOC, start, size, _tag); + NotifyMemInfo(suballoc ? MemBlockFlags::SUB_ALLOC : MemBlockFlags::ALLOC, start, size, _tag ? _tag : ""); if (_tag) truncate_cpy(tag, _tag); else diff --git a/GPU/Debugger/Playback.cpp b/GPU/Debugger/Playback.cpp index 4a7fb9ca00..9009632b33 100644 --- a/GPU/Debugger/Playback.cpp +++ b/GPU/Debugger/Playback.cpp @@ -330,7 +330,7 @@ void DumpExecute::SyncStall() { bool DumpExecute::SubmitCmds(const void *p, u32 sz) { if (execListBuf == 0) { u32 allocSize = LIST_BUF_SIZE; - execListBuf = userMemory.Alloc(allocSize, "List buf"); + execListBuf = userMemory.Alloc(allocSize, true, "List buf"); if (execListBuf == -1) { execListBuf = 0; }