From 55e12a53d09dc1b352dfc2ffa5ef24af71aae89f Mon Sep 17 00:00:00 2001
From: emteere <47253321+emteere@users.noreply.github.com>
Date: Tue, 14 Jul 2020 21:27:50 -0400
Subject: [PATCH] GP-24_emteere_PcodeDisEmulationError_2 minor refactor

---
 .../ghidra/program/model/mem/WrappedMemBuffer.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/WrappedMemBuffer.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/WrappedMemBuffer.java
index ab89150342..7eab8170f6 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/WrappedMemBuffer.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/mem/WrappedMemBuffer.java
@@ -160,14 +160,14 @@ public class WrappedMemBuffer implements MemBuffer {
 	private void fillBuffer(int offset) throws MemoryAccessException {
 		// fill the buffer
 		int nRead = memBuffer.getBytes(buffer, computeOffset(offset));
-
-		subBufferIndex = -offset;
-		minOffset = offset;
-		maxOffset = offset + nRead - 1;
-
+		
 		if (nRead == 0) {
 			throw new MemoryAccessException();
 		}
+		
+		subBufferIndex = -offset;
+		minOffset = offset;
+		maxOffset = offset + nRead - 1;
 	}
 
 	@Override