Ghidra is a software reverse engineering (SRE) framework
GP-0 fix isValidRange() to allow reading 0 bytes at EOF
dev7473680737eaa70808
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.javaindex 6d1779321b..3732183cec 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/ByteProvider.java@@ -101,14 +101,15 @@ public interface ByteProvider extends Closeable {* @param startIndex the starting index to check* @param count the number of bytes to check* @return boolean true if all bytes between startIndex to startIndex+count (exclusive) are- * valid+ * valid. Reading 0 bytes at EOF is also considered valid.*/default boolean isValidRange(long startIndex, int count) {// Note: this default implementation can not correctly handle ByteProviders that use the// full uint64 index range (because length() can not be accurate). Override and provide// a custom implementation.- return count >= 0 && isValidIndex(startIndex) &&- Long.compareUnsigned(startIndex + count, length()) <= 0;+ return (count == 0 && startIndex == length()) || // allow reading 0 bytes at EOF+ (count >= 0 && isValidIndex(startIndex) &&+ Long.compareUnsigned(startIndex + count, length()) <= 0);}/**diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/MemBufferByteProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/MemBufferByteProvider.javaindex 64821fe957..f111df9a47 100644--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/MemBufferByteProvider.java+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/MemBufferByteProvider.java@@ -81,7 +81,9 @@ public class MemBufferByteProvider implements ByteProvider {return false;}try {- buffer.getByte((int) startIndex);+ if (count > 0) {+ buffer.getByte((int) startIndex);+ }if (count > 1) {buffer.getByte((int) (startIndex + count - 1));}diff --git a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/ProgramInsertByteProvider.java b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/ProgramInsertByteProvider.javaindex f61f6b50b9..38a4ea9ded 100644--- a/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/ProgramInsertByteProvider.java+++ b/Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/dump/cmd/ProgramInsertByteProvider.java@@ -82,7 +82,9 @@ public class ProgramInsertByteProvider implements ByteProvider {return false;}try {- buffer.getByte((int) startIndex);+ if (count > 0) {+ buffer.getByte((int) startIndex);+ }if (count > 1) {buffer.getByte((int) (startIndex + count - 1));}