Skip to content

Commit b21ee4b

Browse files
committed
Fix race condition in import_options test
1 parent 4f363ef commit b21ee4b

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
@@ -195,9 +195,12 @@ impl Identity {
195195
}
196196
});
197197

198-
let keychain = match *TEMP_KEYCHAIN.lock().unwrap() {
199-
Some((ref keychain, _)) => keychain.clone(),
200-
ref mut lock @ None => {
198+
// keep it locked during import()
199+
let keychain = &mut *TEMP_KEYCHAIN.lock().unwrap();
200+
201+
let keychain = match keychain {
202+
Some((keychain, _)) => keychain.clone(),
203+
lock @ None => {
201204
let dir =
202205
tempfile::TempDir::new().map_err(|_| Error(base::Error::from(errSecIO)))?;
203206

0 commit comments

Comments
 (0)