From f8d7ded2eb2f61735b8b0de8106fc0a86e000aa8 Mon Sep 17 00:00:00 2001 From: Jeff Chien Date: Mon, 3 Jun 2013 21:56:38 -0700 Subject: [PATCH] Fixed a crash point in the memory viewer (if the symbol map doesn't find the value). --- Windows/Debugger/CtrlMemView.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp index 267a28fa16..94d3c9f10e 100644 --- a/Windows/Debugger/CtrlMemView.cpp +++ b/Windows/Debugger/CtrlMemView.cpp @@ -231,12 +231,20 @@ void CtrlMemView::onPaint(WPARAM wParam, LPARAM lParam) if (align==4) { u32 value = Memory::ReadUnchecked_U32(address); - sprintf(temp, "%08x [%s]", value, symbolMap.GetSymbolName(symbolMap.GetSymbolNum(value))); + int num = symbolMap.GetSymbolNum(value); + if (num != -1) + sprintf(temp, "%08x [%s]", value, symbolMap.GetSymbolName(num)); + else + sprintf(temp, "%08x", value); } else if (align==2) { u16 value = Memory::ReadUnchecked_U16(address); - sprintf(temp, "%04x [%s]", value, symbolMap.GetSymbolName(symbolMap.GetSymbolNum(value))); + int num = symbolMap.GetSymbolNum(value); + if (num != -1) + sprintf(temp, "%04x [%s]", value, symbolMap.GetSymbolName(num)); + else + sprintf(temp, "%04x", value); } TextOut(hdc,70,rowY1,temp,(int)strlen(temp));