From 65c8f63e86cc08ddcb2813c2b74ecc1b111adba7 Mon Sep 17 00:00:00 2001
From: ghizard <50744617+ghizard@users.noreply.github.com>
Date: Mon, 3 Jul 2023 12:11:45 -0400
Subject: [PATCH] GP-3603 - PDB - increase max pagesize to 0x2000

---
 .../util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java    | 7 +++++++
 .../app/util/bin/format/pdb2/pdbreader/msf/Msf700.java     | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
index 3c9760c78d..a45c8994e0 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/AbstractMsf.java
@@ -150,6 +150,12 @@ public abstract class AbstractMsf implements Msf {
 		this.pdbOptions = Objects.requireNonNull(pdbOptions, "PdbOptions may not be null");
 		// Do initial configuration with largest possible page size.  ConfigureParameters will
 		//  be called again later with the proper pageSize set.
+		// GP-3603... considered changing the pagesize for the initial header read from
+		//  0x1000 to 0x2000, but I don't think there is anything needed beyond 0x1000 offset
+		//  in terms of header information, and if we did change it, then we'd run the risk
+		//  of an extremely small PDB (pagesize of 0x200 and less than 16 pages) not being
+		//  able to be read (initial header read would fail).  Determining if such a small
+		//  PDB is possible would be more work than I fell necessary at this time.
 		pageSize = 0x1000;
 		configureParameters();
 		// Create components.
@@ -217,6 +223,7 @@ public abstract class AbstractMsf implements Msf {
 	 * Returns the file reader
 	 * @return the file reader
 	 */
+	@Override
 	public MsfFileReader getFileReader() {
 		return fileReader;
 	}
diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf700.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf700.java
index d9b7411b49..8d3e745651 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf700.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb2/pdbreader/msf/Msf700.java
@@ -92,6 +92,10 @@ public class Msf700 extends AbstractMsf {
 				log2PageSize = 12;
 				freePageMapNumSequentialPage = 1;
 				break;
+			case 0x2000:
+				log2PageSize = 13;
+				freePageMapNumSequentialPage = 1;
+				break;
 			default:
 				throw new PdbException(String.format("Unknown page size: 0X%08X", pageSize));
 		}