Skip to content

Fix crash from line overflow #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noahsmartin merged 1 commit into from
May 29, 2025
Merged

Fix crash from line overflow #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions Sources/FaultOrderingTests/Linkmap.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func getLinkmap() throws -> [Int: Symbol] {
fclose(file)
}

var buffer = [CChar](repeating: 0, count: 256)
var buffer = [CChar](repeating: 0, count: 512)
var inTextSection = false
var inSections = false
var inObjectFiles = false
Expand All @@ -56,8 +56,8 @@ func getLinkmap() throws -> [Int: Symbol] {
var objects = [ObjectFile]()
while fgets(&buffer, Int32(buffer.count), file) != nil {
// If buffer is completely full, skip (line too long)
if buffer[255] != 0 {
buffer = [CChar](repeating: 0, count: 256)
if buffer[511] != 0 {
buffer = [CChar](repeating: 0, count: 512)
continue
}

Expand Down Expand Up @@ -115,12 +115,14 @@ func getLinkmap() throws -> [Int: Symbol] {
textSectionSize = UInt64(components[1].dropFirst(2), radix: 16) ?? 0
}
} else if inObjectFiles {
let line = line[line.index(line.index(of: "]")!, offsetBy: 2)...]
if let match = try? /^(.*?)(?:\((.*)\))?$/.firstMatch(in: line) {
if let file = match.2.map { String($0) } {
objects.append(ObjectFile(file: file, library: String(match.1)))
} else {
objects.append(ObjectFile(file: String(match.1), library: nil))
if let bracketIndex = line.index(of: "]") {
let line = line[line.index(bracketIndex, offsetBy: 2)...]
if let match = try? /^(.*?)(?:\((.*)\))?$/.firstMatch(in: line) {
if let file = match.2.map { String($0) } {
objects.append(ObjectFile(file: file, library: String(match.1)))
} else {
objects.append(ObjectFile(file: String(match.1), library: nil))
}
}
}
}
Expand Down