Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Fix chained firmware patch data flow

xiahouzhen7f1a210242c6
diff --git a/sources/FirmwarePatcher/IBoot/IBootPatcher.swift b/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
index 7e4b05f8..9a9bb919 100644
--- a/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
+++ b/sources/FirmwarePatcher/IBoot/IBootPatcher.swift
@@ -202,8 +202,13 @@ public class IBootPatcher: Patcher {
}
guard let labelBytes = labelStr.data(using: .ascii) else { return }
- // Collect all runs of '=' (>=20 chars) — same logic as Python.
let raw = buffer.original
+ if raw.range(of: labelBytes) != nil {
+ if verbose { print(" [*] serial labels: already present, skipping") }
+ return
+ }
+
+ // Collect all runs of '=' (>=20 chars) — same logic as Python.
var eqRuns: [Int] = []
var i = raw.startIndex
diff --git a/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift b/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
index a7d5db0a..03cc19a3 100644
--- a/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
+++ b/sources/FirmwarePatcher/Pipeline/FirmwarePipeline.swift
@@ -134,7 +134,7 @@ public final class FirmwarePipeline {
var componentRecords: [PatchRecord] = []
for makePatcher in component.patcherFactories {
- let patcher = makePatcher(rawData, verbose)
+ let patcher = makePatcher(currentData, verbose)
let records = try patcher.findAll()
guard !records.isEmpty else {
@@ -145,18 +145,7 @@ public final class FirmwarePipeline {
log(" [+] \(count) \(component.name) patches applied")
componentRecords.append(contentsOf: records)
- if let deviceTreePatcher = patcher as? DeviceTreePatcher {
- currentData = deviceTreePatcher.patchedData
- } else if let filesystemPatcher = patcher as? CryptexFilesystemPatcher {
- currentData = filesystemPatcher.patchedData
- } else if let manifestPatcher = patcher as? ManifestHashPatcher {
- currentData = manifestPatcher.patchedData
- } else {
- for record in records {
- let range = record.fileOffset ..< record.fileOffset + record.patchedBytes.count
- currentData.replaceSubrange(range, with: record.patchedBytes)
- }
- }
+ currentData = extractPatchedData(from: patcher, fallback: currentData, records: records)
}
try loader.save(currentData, to: fileURL)
diff --git a/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift b/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
index c68f98b2..b9042dfb 100644
--- a/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
+++ b/tests/FirmwarePatcherTests/FirmwarePatcherTests.swift
@@ -298,6 +298,31 @@ struct BinaryBufferTests {
}
}
+struct IBootPatcherIdempotencyTests {
+ @Test func serialLabelsPatchTwoBannerRunsWhenLabelAbsent() {
+ let banner = String(repeating: "=", count: 32)
+ let payload = Data("prefix \(banner) middle \(banner) suffix".utf8)
+ let patcher = IBootPatcher(data: payload, mode: .ibss, verbose: false)
+
+ patcher.patchSerialLabels()
+
+ #expect(patcher.patches.count == 2)
+ #expect(patcher.patches.allSatisfy {
+ String(data: $0.patchedBytes, encoding: .ascii) == "Loaded iBSS"
+ })
+ }
+
+ @Test func serialLabelsSkipWhenLabelAlreadyPresent() {
+ let banner = String(repeating: "=", count: 32)
+ let payload = Data("Loaded iBSS\0 prefix \(banner) middle \(banner) suffix".utf8)
+ let patcher = IBootPatcher(data: payload, mode: .ibss, verbose: false)
+
+ patcher.patchSerialLabels()
+
+ #expect(patcher.patches.isEmpty)
+ }
+}
+
struct IM4PPayloadParityTests {
@Test func ibssIM4PPayloadMatchesRawAndJBPatcherFindsNoncePatch() throws {
let baseDir = URL(fileURLWithPath: #filePath)