From 17d8b803d64f95729080e8eb7396aa9920caa89e Mon Sep 17 00:00:00 2001
From: barv <barv@jfrog.com>
Date: Tue, 1 Oct 2024 14:51:40 +0300
Subject: [PATCH] cocoapods-audit

---
 commands/audit/sca/cocoapods/cocoapods.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/commands/audit/sca/cocoapods/cocoapods.go b/commands/audit/sca/cocoapods/cocoapods.go
index e3bd171c..e7f47778 100644
--- a/commands/audit/sca/cocoapods/cocoapods.go
+++ b/commands/audit/sca/cocoapods/cocoapods.go
@@ -43,13 +43,18 @@ func GetTechDependencyLocation(directDependencyName, directDependencyVersion str
 		lines := strings.Split(string(data), "\n")
 		var startLine, startCol, endLine, endCol int
 		foundDependency := false
+		var tempIndex int
 		for i, line := range lines {
 			if strings.Contains(line, directDependencyName) {
 				startLine = i
 				startCol = strings.Index(line, directDependencyName)
 				foundDependency = true
+				tempIndex = i
 			}
-			if foundDependency && strings.Contains(line, directDependencyVersion) {
+			// This means we are in a new dependency (we cannot find dependency name and version together)
+			if i > tempIndex && foundDependency && strings.Contains(line, "pod") {
+				foundDependency = false
+			} else if foundDependency && strings.Contains(line, directDependencyVersion) {
 				endLine = i
 				endCol = len(line)
 				var snippet string
@@ -89,11 +94,16 @@ func FixTechDependency(dependencyName, dependencyVersion, fixVersion string, des
 		}
 		lines := strings.Split(string(data), "\n")
 		foundDependency := false
-		for _, line := range lines {
+		var tempIndex int
+		for index, line := range lines {
 			if strings.Contains(line, dependencyName) {
 				foundDependency = true
+				tempIndex = index
 			}
-			if foundDependency && strings.Contains(line, dependencyVersion) {
+			// This means we are in a new dependency (we cannot find dependency name and version together)
+			if index > tempIndex && foundDependency && strings.Contains(line, "pod") {
+				foundDependency = false
+			} else if foundDependency && strings.Contains(line, dependencyVersion) {
 				newLine := strings.Replace(line, dependencyVersion, fixVersion, 1)
 				newLines = append(newLines, newLine)
 				foundDependency = false