From 97aadfa05aa63a3e667ccf6ea9647dfae152074a Mon Sep 17 00:00:00 2001
From: Ryan Kurtz <ryanmkurtz@users.noreply.github.com>
Date: Tue, 10 Dec 2024 12:26:18 -0500
Subject: [PATCH] GP-0: Improving bounds check in DebugDirectory.java (Closes
 #7271)

---
 .../app/util/bin/format/pe/debug/DebugDirectory.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectory.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectory.java
index 57694f854e..85f9d96a5b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectory.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugDirectory.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -92,8 +92,9 @@ public class DebugDirectory implements StructConverter, ByteArrayConverter {
 				return;
 			}
 			if (sizeOfData > 0) {
-				if (!validator.checkPointer(pointerToRawData)) {
-					Msg.error(this, "Invalid pointerToRawData " + pointerToRawData);
+				if (!validator.checkPointer(pointerToRawData + sizeOfData - 1)) {
+					Msg.error(this, "Invalid debug pointerToRawData + sizeOfData: 0x%x"
+							.formatted(pointerToRawData + sizeOfData - 1));
 					sizeOfData = 0;
 					reader.setPointerIndex(oldIndex);
 					return;