exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

keyring: remove race condition from unlocking

Browse source
This commit is contained in:
Mirek Kratochvil 2013-04-20 23:43:37 +02:00
parent c6278b8e54
commit bb9640f6b7
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/keyring.cpp
View file

@ -459,10 +459,14 @@ bool keyring::close()
/* /*
* close and remove the lock. Because of temporary lack of proper * close and remove the lock. Because of temporary lack of proper
* reporting, we just ignore the errors now. * reporting, we just ignore the errors now.
*
* Note that unlink goes first, so that the lock disappears atomically.
*/ */
flock (lockfd, LOCK_UN);
::close (lockfd);
std::string fn = get_user_dir() + LOCK_FILENAME; std::string fn = get_user_dir() + LOCK_FILENAME;
unlink (fn.c_str() ); unlink (fn.c_str() );
flock (lockfd, LOCK_UN);
::close (lockfd);
return true; return true;
} }