Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-17 08:01:12 +02:00
Code Issues Releases Wiki Activity

Exception safety in: locking of BlockFile for read

Browse Source
This commit is contained in:
Paul Licameli
2016-11-28 14:28:44 -05:00
parent f5fe9281e4
commit ed6f2ea80f
5 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ondemand/ODDecodeTask.cpp
View File

@@ -57,15 +57,16 @@ void ODDecodeTask::DoSomeInternal()
//OD TODO: somehow pass the bf a reference to the decoder that manages its file.
//we need to ensure that the filename won't change or be moved. We do this by calling LockRead(),
//which the dirmanager::EnsureSafeFilename also does.
bf->LockRead();
//Get the decoder. If the file was moved, we need to create another one and init it.
decoder = GetOrCreateMatchingFileDecoder( &*bf );
if(!decoder->IsInitialized())
decoder->Init();
bf->SetODFileDecoder(decoder);
// Does not throw:
ret = bf->DoWriteBlockFile();
bf->UnlockRead();
{
auto locker = bf->LockForRead();
//Get the decoder. If the file was moved, we need to create another one and init it.
decoder = GetOrCreateMatchingFileDecoder( &*bf );
if(!decoder->IsInitialized())
decoder->Init();
bf->SetODFileDecoder(decoder);
// Does not throw:
ret = bf->DoWriteBlockFile();
}
if(ret >= 0) {
success = true;