fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-11-23 17:54 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
==> ChangeLog <==
2011-11-17 09:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/src/rtl/filebuf.c
    ! fixed silly typo in previous fix: 2011-09-02 14:03 UTC+0200
    ! fixed race condition in code emulating DOS/Windows file lock
      behavior in POSIX systems. The problem could be exploited by
      Harbour MT programs using the same files in many threads in
      more then on process. Many thanks to Zsolt for the info and
      test code example.
      [TOMERGE 3.0]
This commit is contained in:
Przemyslaw Czerpak
2011-11-23 16:54:49 +00:00
parent 0c38ab1529
commit d8bb277c4d
2 changed files with 21 additions and 219422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219427
harbour/ChangeLog
View File

File diff suppressed because it is too large Load Diff

16
harbour/src/rtl/filebuf.c
View File

@@ -280,7 +280,9 @@ static HB_BOOL hb_fileUnlock( PHB_FILE pFile, HB_BOOL * pfLockFS,
if( nStart >= pLock->start &&
nStart + nLen <= pLock->start + pLock->len )
{
if( nStart == pLock->start )
if( pfLockFS && pFile->shared )
* pfLockFS = HB_TRUE;
else if( nStart == pLock->start )
{
if( nLen == pLock->len )
hb_fileDeleteLock( pFile, uiPos );
@@ -296,10 +298,9 @@ static HB_BOOL hb_fileUnlock( PHB_FILE pFile, HB_BOOL * pfLockFS,
{
hb_fileInsertLock( pFile, uiPos + 1, nStart + nLen,
pLock->start + pLock->len - nStart - nLen );
pFile->pLocks[ uiPos ].len = nStart - pLock->start;
pLock = &pFile->pLocks[ uiPos ];
pLock->len = nStart - pLock->start;
}
if( pFile->shared )
* pfLockFS = HB_TRUE;
fResult = HB_TRUE;
}
}
@@ -509,7 +510,12 @@ static HB_BOOL s_fileLock( PHB_FILE pFile, HB_FOFFSET nStart, HB_FOFFSET nLen,
fResult = hb_fileUnlock( pFile, &fLockFS, nStart, nLen );
hb_threadLeaveCriticalSection( &s_fileMtx );
if( fLockFS )
{
hb_fsLockLarge( pFile->hFile, nStart, nLen, ( HB_USHORT ) iType );
hb_threadEnterCriticalSection( &s_fileMtx );
hb_fileUnlock( pFile, NULL, nStart, nLen );
hb_threadLeaveCriticalSection( &s_fileMtx );
}
else
hb_fsSetError( fResult ? 0 : 33 );
}
@@ -524,7 +530,7 @@ static HB_BOOL s_fileLock( PHB_FILE pFile, HB_FOFFSET nStart, HB_FOFFSET nLen,
if( !fResult )
{
hb_threadEnterCriticalSection( &s_fileMtx );
hb_fileUnlock( pFile, &fLockFS, nStart, nLen );
hb_fileUnlock( pFile, NULL, nStart, nLen );
hb_threadLeaveCriticalSection( &s_fileMtx );
}
}