From e65e77e7cd4deba0d03b846a6904fbf51a03829d Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Thu, 14 Jan 2021 09:50:46 -0500
Subject: [PATCH] GB GPU Viewer: Bounds check tile drawing for OBJ window,
 seems to resolve random crashing

---
 src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
index a7a47cc351..a0ed7769ab 100644
--- a/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
@@ -375,11 +375,15 @@ namespace BizHawk.Client.EmuHawk
 				if (cgb && flags.Bit(3))
 					tile += 8192;
 
-				DrawTileHv(tile, dest, pitch, thisPal, hFlip, vFlip);
-
-				if (tall)
+				// only draw tiles that are completely in bounds so to avoid out of bounds accesses
+				if ((xPos <= 248) && (yPos <= 240))
 				{
-					DrawTileHv(tile + 16, dest + pitch * 8, pitch, thisPal, hFlip, vFlip);
+					DrawTileHv(tile, dest, pitch, thisPal, hFlip, vFlip);
+
+					if (tall)
+					{
+						DrawTileHv(tile + 16, dest + pitch * 8, pitch, thisPal, hFlip, vFlip);
+					}
 				}
 
 				dest -= xPos + yPos * pitch;