summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2023-08-08 11:56:06 +0200
committerLinus Färnstrand <linus@mullvad.net>2023-08-08 11:56:06 +0200
commit652d163d575bab039a57c156b89628de66e472bd (patch)
treed25efd3fb591b460994f526ce6e539831bc30b02
parent6cf4ea8f28b0cd1852c4445f407124ef8b663e85 (diff)
parentadeb6b714114e2cf3a6da873a744079bbf1c247b (diff)
downloadmullvadvpn-652d163d575bab039a57c156b89628de66e472bd.tar.xz
mullvadvpn-652d163d575bab039a57c156b89628de66e472bd.zip
Merge branch 'enable-more-safety-around-objective-c-code-des-321'
-rw-r--r--Cargo.lock10
-rw-r--r--mullvad-daemon/Cargo.toml2
2 files changed, 11 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6bc9b89fc1..e7b5e807b6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2388,6 +2388,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
dependencies = [
"malloc_buf",
+ "objc_exception",
+]
+
+[[package]]
+name = "objc_exception"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
+dependencies = [
+ "cc",
]
[[package]]
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 2b5a576ffd..8270f1c474 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -55,7 +55,7 @@ simple-signal = "1.1"
talpid-dbus = { path = "../talpid-dbus" }
[target.'cfg(target_os="macos")'.dependencies]
-objc = "0.2.3"
+objc = { version = "0.2.7", features = ["exception"] }
[target.'cfg(windows)'.dependencies]
ctrlc = "3.0"