phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix: atlas calls ReloadChangedFiles before InitVfs, so safely handle directory watch requests before then (by checking for invalid completion port handle)

Browse Source 
fix: prevent a pending IO from writing into freed memory by waiting for
the CancelIo to complete

This was SVN commit r7263.
This commit is contained in:
janwas 2010-01-09 22:32:27 +00:00
parent 29c1f282ec
commit e4be0892f8
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/lib/sysdep/os/win/wdir_watch.cpp
View File

@ -83,7 +83,19 @@ public:
~DirWatchRequest()
{
// m_data's dtor will free the memory after this function returns,
// so the pending IO had better not write into that memory. therefore:
WARN_IF_FALSE(CancelIo(m_dirHandle));
// however, this is not synchronized with the DPC (?) that apparently
// delivers the data (we have seen m_data being filled regardless).
// we need to ensure that either the IO has happened or that it
// was successfully canceled before freeing m_data, so wait:
{
WinScopedPreserveLastError s;
DWORD dwBytesTransferred = 0; // unused
const BOOL ok = GetOverlappedResult(m_dirHandle, &m_ovl, &dwBytesTransferred, TRUE);
debug_assert(ok || GetLastError() == ERROR_OPERATION_ABORTED);
}
}
const fs::wpath& Path() const
@ -291,6 +303,8 @@ public:
LibError Poll(size_t& bytesTransferred, uintptr_t& key, OVERLAPPED*& ovl)
{
if(m_hIOCP == 0)
return INFO::SKIPPED;
for(;;) // don't return abort notifications to caller
{
DWORD dwBytesTransferred = 0;