config: when returning compiled regexps slice, make sure to return a …

…copy as extra precaution
DarkCaster · Jan 6, 2025 · f0d811f · f0d811f
1 parent 604d290
commit f0d811f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/config/config_utils.go b/config/config_utils.go
@@ -108,7 +108,7 @@ func compileRegexArray(source []string, name string) ([]*regexp.Regexp, error) {
 
 func interfaceToStringArray(source interface{}) []string {
 	sourceArray := source.([]interface{})
-	target := make([]string, len(sourceArray))
+	target := make([]string, len(sourceArray), cap(sourceArray))
 	for i, element := range sourceArray {
 		target[i] = element.(string)
 	}
@@ -117,7 +117,7 @@ func interfaceToStringArray(source interface{}) []string {
 
 func interfaceTo2DStringArray(source interface{}) [][]string {
 	sourceArray := source.([]interface{})
-	target := make([][]string, len(sourceArray))
+	target := make([][]string, len(sourceArray), cap(sourceArray))
 	for i, element := range sourceArray {
 		target[i] = interfaceToStringArray(element)
 	}

diff --git a/config/op_annotate_config.go b/config/op_annotate_config.go
@@ -97,7 +97,7 @@ func (o *opAnnotateConfig) Regexp(key string) *regexp.Regexp {
 }
 
 func (o *opAnnotateConfig) RegexpArray(key string) []*regexp.Regexp {
-	return o.cfgValues[key].([]*regexp.Regexp)
+	return utils.NewSlice(o.cfgValues[key].([]*regexp.Regexp)...)
 }
 
 func (o *opAnnotateConfig) String(key string) string {

diff --git a/config/op_doc_config.go b/config/op_doc_config.go
@@ -66,7 +66,7 @@ func (o *opDocConfig) Regexp(key string) *regexp.Regexp {
 }
 
 func (o *opDocConfig) RegexpArray(key string) []*regexp.Regexp {
-	return o.cfgValues[key].([]*regexp.Regexp)
+	return utils.NewSlice(o.cfgValues[key].([]*regexp.Regexp)...)
 }
 
 func (o *opDocConfig) String(key string) string {

diff --git a/config/op_implement_config.go b/config/op_implement_config.go
@@ -88,7 +88,7 @@ func (o *opImplementConfig) Regexp(key string) *regexp.Regexp {
 }
 
 func (o *opImplementConfig) RegexpArray(key string) []*regexp.Regexp {
-	return o.cfgValues[key].([]*regexp.Regexp)
+	return utils.NewSlice(o.cfgValues[key].([]*regexp.Regexp)...)
 }
 
 func (o *opImplementConfig) String(key string) string {

diff --git a/config/op_report_config.go b/config/op_report_config.go
@@ -49,7 +49,7 @@ func (o *opReportConfig) Regexp(key string) *regexp.Regexp {
 }
 
 func (o *opReportConfig) RegexpArray(key string) []*regexp.Regexp {
-	return o.cfgValues[key].([]*regexp.Regexp)
+	return utils.NewSlice(o.cfgValues[key].([]*regexp.Regexp)...)
 }
 
 func (o *opReportConfig) String(key string) string {

diff --git a/config/project_config.go b/config/project_config.go
@@ -73,7 +73,7 @@ func (o *projectConfig) Regexp(key string) *regexp.Regexp {
 }
 
 func (o *projectConfig) RegexpArray(key string) []*regexp.Regexp {
-	return o.cfgValues[key].([]*regexp.Regexp)
+	return utils.NewSlice(o.cfgValues[key].([]*regexp.Regexp)...)
 }
 
 func (o *projectConfig) String(key string) string {