fix(templating): data race in array append

natesales · Sep 4, 2024 · f130b9a · f130b9a
1 parent 825acca
commit f130b9a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/templating/templating.go b/pkg/templating/templating.go
@@ -192,6 +192,9 @@ var funcMap = template.FuncMap{
 
 	// UniqueProtocolName takes a protocol-safe string and address family and returns a unique protocol name
 	"UniqueProtocolName": func(s, userSuppliedName *string, af string, asn *int, tags *[]string) string {
+		protocolNameMapLock.Lock()
+		defer protocolNameMapLock.Unlock()
+
 		protoName := fmt.Sprintf("%s_AS%d_v%s", *s, *asn, af)
 		i := 1
 		for {
@@ -201,12 +204,10 @@ var funcMap = template.FuncMap{
 				if tags != nil {
 					t = *tags
 				}
-				protocolNameMapLock.Lock()
 				protocolNameMap[protoName] = &Protocol{
 					Name: *userSuppliedName,
 					Tags: t,
 				}
-				protocolNameMapLock.Unlock()
 				return protoName
 			}
 			protoName = fmt.Sprintf("%s_AS%d_v%s_%d", *s, *asn, af, i)