From 047aa254e20a8ce745cd03270b6cb46c24626ee8 Mon Sep 17 00:00:00 2001
From: Andrew LeFevre <jalefevre@liberty.edu>
Date: Mon, 26 Oct 2020 08:03:33 -0400
Subject: [PATCH] properly remove all filenames when -tiny is passed (#160)

* properly remove all filenames when -tiny is passed

* document filename symbol removal
---
 import_obfuscation.go     | 16 ++++++++++++++++
 testdata/scripts/tiny.txt |  1 +
 2 files changed, 17 insertions(+)

diff --git a/import_obfuscation.go b/import_obfuscation.go
index 822c1d1..e44c483 100644
--- a/import_obfuscation.go
+++ b/import_obfuscation.go
@@ -291,6 +291,15 @@ func stripPCLinesAndNames(am *goobj2.ArchiveMember) {
 	lists := [][]*goobj2.Sym{am.SymDefs, am.NonPkgSymDefs, am.NonPkgSymRefs}
 	for _, list := range lists {
 		for _, s := range list {
+			// remove filename symbols when -tiny is passed as they
+			// are only used for printing panics, and -tiny removes
+			// panic printing; we need to set the symbol names to
+			// 'gofile..', otherwise the linker will expect to see
+			// filename symbols and panic
+			if strings.HasPrefix(s.Name, "gofile..") {
+				s.Name = "gofile.."
+			}
+
 			if s.Func == nil {
 				continue
 			}
@@ -495,6 +504,13 @@ func garbleSymbolName(symName string, privImports privateImports, garbledImports
 		return symName
 	}
 
+	// remove filename symbols when -tiny is passed
+	// as they are only used for printing panics,
+	// and -tiny removes panic printing
+	if envGarbleTiny && prefix == "gofile.." {
+		return prefix
+	}
+
 	var namedataSym bool
 	if prefix == "type..namedata." {
 		namedataSym = true
diff --git a/testdata/scripts/tiny.txt b/testdata/scripts/tiny.txt
index 65448a7..f9614a7 100644
--- a/testdata/scripts/tiny.txt
+++ b/testdata/scripts/tiny.txt
@@ -2,6 +2,7 @@ env GOPRIVATE=test/main
 
 # Tiny mode
 garble -tiny build
+! binsubstr main$exe 'main.go' 'fmt/print.go'
 env GODEBUG='allocfreetrace=1,gcpacertrace=1,gctrace=1,scavenge=1,scavtrace=1,scheddetail=1,schedtrace=10'
 ! exec ./main$exe
 cmp stdout main.stdout