fixed race condition in RunCmdWithOutputParser

jfrog · Nov 28, 2023 · ef079aa · ef079aa
1 parent 30d7647
commit ef079aa
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/io/cmd.go b/io/cmd.go
@@ -94,9 +94,11 @@ func RunCmdWithOutputParser(config CmdConfig, prompt bool, regExpStruct ...*CmdO
 			for _, regExp := range regExpStruct {
 				matched := regExp.RegExp.Match([]byte(line))
 				if matched {
-					regExp.MatchedResults = regExp.RegExp.FindStringSubmatch(line)
-					regExp.Line = line
-					line, err = regExp.ExecFunc(regExp)
+					results := CmdOutputPattern{
+						MatchedResults: regExp.RegExp.FindStringSubmatch(line),
+						Line:           line,
+					}
+					line, err = regExp.ExecFunc(&results)
 					if err != nil {
 						errChan <- err
 					}
@@ -117,8 +119,11 @@ func RunCmdWithOutputParser(config CmdConfig, prompt bool, regExpStruct ...*CmdO
 			for _, regExp := range regExpStruct {
 				matched := regExp.RegExp.Match([]byte(line))
 				if matched {
-					regExp.MatchedResults = regExp.RegExp.FindStringSubmatch(line)
-					regExp.Line = line
+					results := CmdOutputPattern{
+						MatchedResults: regExp.RegExp.FindStringSubmatch(line),
+						Line:           line,
+					}
+					line, err = regExp.ExecFunc(&results)
 					line, scannerError = regExp.ExecFunc(regExp)
 					if scannerError != nil {
 						errChan <- scannerError