Fixed Glob crash (yonaskolb#1181)

Iron-Ham · Mar 6, 2022 · a10c7c4 · a10c7c4
1 parent d218ada
commit a10c7c4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next Version
 
+### Fixed
+
+- Fixed crash caused by a simultaneous write during a glob processing [#1177](https://github.com/yonaskolb/XcodeGen/issues/1177) @tr1ckyf0x
+
 ## 2.26.0
 
 ### Added

diff --git a/Sources/XcodeGenCore/Atomic.swift b/Sources/XcodeGenCore/Atomic.swift
@@ -0,0 +1,27 @@
+//
+// Atomic.swift
+// 
+//
+// Created by Vladislav Lisianskii on 23.02.2022.
+//
+
+import Foundation
+
+@propertyWrapper
+struct Atomic<Value> {
+ private let queue = DispatchQueue(label: "com.xcodegencore.atomic")
+ private var value: Value
+
+ init(wrappedValue: Value) {
+ self.value = wrappedValue
+ }
+
+ var wrappedValue: Value {
+ get {
+ return queue.sync { value }
+ }
+ set {
+ queue.sync { value = newValue }
+ }
+ }
+}
diff --git a/Sources/XcodeGenCore/Glob.swift b/Sources/XcodeGenCore/Glob.swift
@@ -57,7 +57,7 @@ public class Glob: Collection {
 
  public static let defaultBlacklistedDirectories = ["node_modules", "Pods"]
 
- private var isDirectoryCache = [String: Bool]()
+ @Atomic private var isDirectoryCache = [String: Bool]()
 
  public let behavior: Behavior
  public let blacklistedDirectories: [String]