From 9b96306f801b43cd8fc194e98966bc992bf7e15f Mon Sep 17 00:00:00 2001
From: ghizard <50744617+ghizard@users.noreply.github.com>
Date: Wed, 9 Apr 2025 05:54:32 -0400
Subject: [PATCH] GP-5575 - PDB fix regression in using zero-sised base with no
 vbtable

---
 .../ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
index d527e500ae..4a5d22f1f6 100644
--- a/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
+++ b/Ghidra/Features/PDB/src/main/java/ghidra/app/util/pdb/pdbapplicator/CppCompositeType.java
@@ -1743,7 +1743,9 @@ public class CppCompositeType {
 				for (VirtualLayoutBaseClass base : reorderedVirtualBases) {
 					CppCompositeType baseType = base.getBaseClassType();
 					addPlaceholderVirtualBaseTableEntry(plvbt, vxtManager, base, off);
-					off += baseType.getSelfBaseType().getAlignedLength();
+					if (!baseType.hasZeroBaseSize) {
+						off += baseType.getSelfBaseType().getAlignedLength();
+					}
 				}
 				return plvbt;
 			}