wesley/swiftui-math
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes due to forced unwrapping

Browse Source
This commit is contained in:
Daniel Resnick
2025-04-16 18:10:56 -06:00
parent f73b8a1f73
commit f6f4ebfa89
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/SwiftMath/MathRender/MTMathListBuilder.swift
View File

@@ -289,8 +289,11 @@ public struct MTMathListBuilder {
return list return list
} else { } else {
// Create a new table with the current list and a default env // Create a new table with the current list and a default env
let table = self.buildTable(env: nil, firstList: list, isRow: false) if let table = self.buildTable(env: nil, firstList: list, isRow: false) {
return MTMathList(atom: table!) return MTMathList(atom: table)
} else {
return nil
}
} }
} else if spacesAllowed && char == " " { } else if spacesAllowed && char == " " {
// If spaces are allowed then spaces do not need escaping with a \ before being used. // If spaces are allowed then spaces do not need escaping with a \ before being used.
@@ -720,7 +723,7 @@ public struct MTMathListBuilder {
return nil return nil
} }
if env! != currentEnv!.envName { if env! != currentEnv!.envName {
let errorMessage = "Begin environment name \(currentEnv!.envName!) does not match end name: \(env!)" let errorMessage = "Begin environment name \(currentEnv!.envName ?? "(none)") does not match end name: \(env!)"
self.setError(.invalidEnv, message:errorMessage) self.setError(.invalidEnv, message:errorMessage)
return nil return nil
} }

4
Tests/SwiftMathTests/MTMathListBuilderTests.swift
View File

@@ -187,7 +187,9 @@ final class MTMathListBuilderTests: XCTestCase {
("\\begin{displaylines} x & y \\end{displaylines}", .invalidNumColumns), ("\\begin{displaylines} x & y \\end{displaylines}", .invalidNumColumns),
("\\begin{eqalign} x \\end{eqalign}", .invalidNumColumns), ("\\begin{eqalign} x \\end{eqalign}", .invalidNumColumns),
("\\nolimits", .invalidLimits), ("\\nolimits", .invalidLimits),
("\\frac\\limits{1}{2}", .invalidLimits) ("\\frac\\limits{1}{2}", .invalidLimits),
("&\\begin", .characterNotFound),
("x & y \\\\ z & w \\end{matrix}", .invalidEnv)
] ]
} }