Skip to content

Commit 56dc8cb

Browse files
committed
Fix race condition in import_options test
1 parent 1542d9c commit 56dc8cb

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/imp/security_framework.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,12 @@ impl Identity {
199199
}
200200
});
201201

202-
let keychain = match *TEMP_KEYCHAIN.lock().unwrap() {
203-
Some((ref keychain, _)) => keychain.clone(),
204-
ref mut lock @ None => {
202+
// keep it locked during import()
203+
let keychain = &mut *TEMP_KEYCHAIN.lock().unwrap();
204+
205+
let keychain = match keychain {
206+
Some((keychain, _)) => keychain.clone(),
207+
lock @ None => {
205208
let dir =
206209
tempfile::TempDir::new().map_err(|_| Error(base::Error::from(errSecIO)))?;
207210

0 commit comments

Comments
 (0)