From e72b17b0db7a1014444f7a985ab47c17918eacf2 Mon Sep 17 00:00:00 2001
From: dev747368 <48332326+dev747368@users.noreply.github.com>
Date: Fri, 7 Mar 2025 21:18:53 +0000
Subject: [PATCH] GP-5462 add some missing gotype name substitutions

---
 .../util/bin/format/golang/rtti/GoTypeManager.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoTypeManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoTypeManager.java
index 11af980f46..7d55b17fb8 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoTypeManager.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/golang/rtti/GoTypeManager.java
@@ -42,7 +42,7 @@ public class GoTypeManager {
 		"*runtime.funcval", "func()" // alias for closure
 	);
 	private static final Pattern TYPENAME_SPLITTER_REGEX =
-		Pattern.compile("(\\*|\\[\\]|\\[[0-9.]\\])(.*)");
+		Pattern.compile("(\\*|\\[\\]|\\[[0-9.]+\\])(.*)");
 
 	static class TypeRec {
 		GoType type;
@@ -647,6 +647,10 @@ public class GoTypeManager {
 		return genericDictDT;
 	}
 
+	public Structure getGenericInterfaceDT() {
+		return goBinary.getStructureDataType(GoIface.class);
+	}
+
 	public DataType getMethodClosureType(String recvType) throws IOException {
 		//struct struct { F uintptr; R *atomic.Uint64 }
 		GoType closureType = findGoType("struct { F uintptr; R %s }".formatted(recvType));
@@ -717,7 +721,7 @@ public class GoTypeManager {
 		if (typeName.startsWith("*")) {
 			return new GoTypeBridge(typeName, dtm.getPointer(null), goBinary);
 		}
-		else if (typeName.startsWith("[]")) {
+		else if (typeName.startsWith("[]") || typeName.equals("runtime.slice")) {
 			return new GoTypeBridge(typeName, getGenericSliceDT(), goBinary);
 		}
 		else if (typeName.startsWith("map[")) {
@@ -730,6 +734,9 @@ public class GoTypeManager {
 			DataType closureType = getDefaultClosureType();
 			return new GoTypeBridge(typeName, dtm.getPointer(closureType), goBinary);
 		}
+		else if (typeName.equals("runtime.iface")) {
+			return new GoTypeBridge(typeName, getGenericInterfaceDT(), goBinary);
+		}
 		return null;
 	}