renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

🩹 Fixes memory leaks caused by NSString usage

Browse Source
This commit is contained in:
Stuart Breckenridge
2025-02-02 22:09:58 +08:00
committed by Brent Simmons
parent 3739906da9
commit a9f33643f6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Shared/Article Rendering/ArticleRenderer.swift
View File

@@ -26,7 +26,7 @@ struct ArticleRenderer {
init(name: String) {
url = Bundle.main.url(forResource: name, withExtension: "html")!
baseURL = url.deletingLastPathComponent()
html = try! NSString(contentsOfFile: url.path, encoding: String.Encoding.utf8.rawValue) as String
html = try! String(contentsOfFile: url.path, encoding: .utf8)
}
}
@@ -180,13 +180,13 @@ private extension ArticleRenderer {
static var defaultStyleSheet: String = {
let path = Bundle.main.path(forResource: "styleSheet", ofType: "css")!
let s = try! NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue)
let s = try! String(contentsOfFile: path, encoding: .utf8)
return "\n\(s)\n"
}()
static let defaultTemplate: String = {
let path = Bundle.main.path(forResource: "template", ofType: "html")!
let s = try! NSString(contentsOfFile: path, encoding: String.Encoding.utf8.rawValue)
let s = try! String(contentsOfFile: path, encoding: .utf8)
return s as String
}()

5
Shared/ArticleStyles/ArticleTheme.swift
View File

@@ -85,8 +85,9 @@ struct ArticleTheme: Equatable {
if !FileManager.default.fileExists(atPath: f) {
return nil
}
if let s = try? NSString(contentsOfFile: f, usedEncoding: nil) as String {
var encoding = String.Encoding.utf8
if let s = try? String(contentsOfFile: f, usedEncoding: &encoding) {
return s
}
return nil