fix: bad recursive target selection

Signed-off-by: 82Flex <82flex@gmail.com>

Author: Lessica

TrollFools/InjectorV3+Backup.swift

@@ -10,7 +10,7 @@ import Foundation
 extension InjectorV3 {
     // MARK: - Constants
 
-    private static let alternateSuffix = "troll-fools.bak"
+    static let alternateSuffix = "troll-fools.bak"
 
     static func alternateURL(for target: URL) -> URL {
         target.appendingPathExtension(Self.alternateSuffix)

TrollFools/InjectorV3+Bundle.swift

@@ -63,6 +63,10 @@ extension InjectorV3 {
                     enumerator.skipDescendants()
                     continue
                 }
+                // Skip backup files created before injection
+                if itemURL.path.hasSuffix(".\(Self.alternateSuffix)") {
+                    continue
+                }
                 if enumerator.level == 2 {
                     enumeratedURLs.append(itemURL)
                     if isMachO(itemURL) {
@@ -113,6 +117,30 @@ extension InjectorV3 {
             }
         }
 
+        // Filter out previously-injected Mach-Os by diffing current vs. backup load commands.
+        // Any load command present in the current binary but absent from its backup was added by injection.
+        var injectedAssetNames = Set<String>()
+        for machO in (allMachOsInFrameworks.elements + [executableURL]) where hasAlternate(machO) {
+            if let current = try? loadedDylibsOfMachO(machO),
+               let original = try? loadedDylibsOfMachO(Self.alternateURL(for: machO))
+            {
+                for name in current where !original.contains(name) {
+                    injectedAssetNames.insert(URL(fileURLWithPath: name).lastPathComponent)
+                }
+            }
+        }
+        if !injectedAssetNames.isEmpty {
+            let preFilterCount = machOs.count
+            machOs = machOs.filter { !injectedAssetNames.contains($0.lastPathComponent) }
+            let excludedCount = preFilterCount - machOs.count
+            if excludedCount > 0 {
+                DDLogInfo(
+                    "Excluded \(excludedCount) previously-injected Mach-Os by backup diff: \(injectedAssetNames.sorted())",
+                    ddlog: logger
+                )
+            }
+        }
+
         var sortedMachOs: [URL] =
             switch injectStrategy {
         case .lexicographic:

TrollFools/InjectorV3+MachO.swift

@@ -66,7 +66,10 @@ extension InjectorV3 {
         var newCollected = collected
         newCollected.append(target)
 
-        let loadedDylibs = try loadedDylibsOfMachO(target).compactMap({ resolveLoadCommand($0) })
+        // If the Mach-O has a backup (made before injection), read load commands
+        // from the original to avoid picking up previously-injected dylibs.
+        let readTarget = hasAlternate(target) ? Self.alternateURL(for: target) : target
+        let loadedDylibs = try loadedDylibsOfMachO(readTarget).compactMap({ resolveLoadCommand($0) })
         for dylib in loadedDylibs {
             newCollected = try linkedDylibsRecursivelyOfMachO(dylib, collected: newCollected)
         }