From 427c63aa3d377d20261a866d142be2a20e206cbb Mon Sep 17 00:00:00 2001 From: skidau Date: Mon, 11 May 2015 07:27:42 +0000 Subject: [PATCH] Fixed an array out of bounds access in the debugger. Fixed a path problem with the wx vbam xpm icon. Patch by Mook. --- src/gba/remote.cpp | 2 +- src/wx/guiinit.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gba/remote.cpp b/src/gba/remote.cpp index b57f27d8..2258dc17 100644 --- a/src/gba/remote.cpp +++ b/src/gba/remote.cpp @@ -244,7 +244,7 @@ void printBreakRegList(bool verbose){ for (int j = 0; j < regBreakCounter[i][k]; j++){ if (tmp->flags & 8) { - sprintf(monbuf, "No. %d:\tBreak if (signed)%s %08x\n", j, flagsToOP[tmp->flags], tmp->intVal); monprintf(monbuf); + sprintf(monbuf, "No. %d:\tBreak if (signed)%s %08x\n", j, flagsToOP[tmp->flags & 7], tmp->intVal); monprintf(monbuf); } else { diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp index ff6d0873..a4920e7a 100644 --- a/src/wx/guiinit.cpp +++ b/src/wx/guiinit.cpp @@ -28,7 +28,7 @@ // ImageMagick makes the name wxvbam, but wx expects wxvbam_xpm #define wxvbam wxvbam_xpm const -#include "xrx/wxvbam.xpm" +#include "xrc/vbam.xpm" #undef wxvbam #endif