mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 02:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash on core.queue by safely reading Strings from config

Browse source
This commit is contained in:
Benoit Martins 2025-09-15 11:35:42 +02:00
parent 54ca929f88
commit c7f7606859
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Linphone/Core/CorePreferences.swift
View file

@ -50,7 +50,8 @@ class CorePreferences {
static var checkForUpdateServerUrl: String { static var checkForUpdateServerUrl: String {
get { get {
return Config.get().getString(section: "misc", key: "version_check_url_root", defaultString: "") let raw = Config.get().getString(section: "misc", key: "version_check_url_root", defaultString: "")
return safeString(raw, defaultValue: "")
} }
set { set {
Config.get().setString(section: "misc", key: "version_check_url_root", value: newValue) Config.get().setString(section: "misc", key: "version_check_url_root", value: newValue)
@ -86,7 +87,8 @@ class CorePreferences {
static var deviceName: String { static var deviceName: String {
get { get {
return Config.get().getString(section: "app", key: "device", defaultString: "").trimmingCharacters(in: .whitespaces) let raw = Config.get().getString(section: "app", key: "device", defaultString: "").trimmingCharacters(in: .whitespaces)
return safeString(raw, defaultValue: "")
} }
set { set {
Config.get().setString(section: "app", key: "device", value: newValue.trimmingCharacters(in: .whitespaces)) Config.get().setString(section: "app", key: "device", value: newValue.trimmingCharacters(in: .whitespaces))
@ -131,7 +133,8 @@ class CorePreferences {
static var contactsFilter: String { static var contactsFilter: String {
get { get {
return Config.get().getString(section: "ui", key: "contacts_filter", defaultString: "") let raw = Config.get().getString(section: "ui", key: "contacts_filter", defaultString: "")
return safeString(raw, defaultValue: "")
} }
set { set {
Config.get().setString(section: "ui", key: "contacts_filter", value: newValue) Config.get().setString(section: "ui", key: "contacts_filter", value: newValue)
@ -177,7 +180,8 @@ class CorePreferences {
static var themeMainColor: String { static var themeMainColor: String {
get { get {
return Config.get().getString(section: "ui", key: "theme_main_color", defaultString: "orange") let raw = Config.get().getString(section: "ui", key: "theme_main_color", defaultString: "orange")
return safeString(raw, defaultValue: "orange")
} }
set { set {
Config.get().setString(section: "ui", key: "theme_main_color", value: newValue) Config.get().setString(section: "ui", key: "theme_main_color", value: newValue)
@ -244,7 +248,8 @@ class CorePreferences {
static var defaultDomain: String { static var defaultDomain: String {
get { get {
return Config.get().getString(section: "app", key: "default_domain", defaultString: "sip.linphone.org") let raw = Config.get().getString(section: "app", key: "default_domain", defaultString: "sip.linphone.org")
return safeString(raw, defaultValue: "sip.linphone.org")
} }
set { set {
Config.get().setString(section: "app", key: "default_domain", value: newValue) Config.get().setString(section: "app", key: "default_domain", value: newValue)
@ -283,4 +288,12 @@ class CorePreferences {
} }
} }
} }
private static func safeString(_ raw: String?, defaultValue: String = "") -> String {
guard let raw = raw else { return defaultValue }
if let data = raw.data(using: .utf8), let s = String(data: data, encoding: .utf8) {
return s
}
return defaultValue
}
} }