marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindClose: protect the GlobalLock for pagefaults too.

oldstable
Marcus Meissner 2002-05-04 18:28:36 +00:00 committed by Alexandre Julliard
parent 714bfd7e4a
commit 77fbbcf30d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
files/dos_fs.c
View File

@ -1806,16 +1806,15 @@ BOOL WINAPI FindClose( HANDLE handle )
{
FIND_FIRST_INFO *info;
if ((handle == INVALID_HANDLE_VALUE) ||
!(info = (FIND_FIRST_INFO *)GlobalLock( handle )))
{
SetLastError( ERROR_INVALID_HANDLE );
return FALSE;
}
if (handle == INVALID_HANDLE_VALUE) goto error;
__TRY
{
if (info->dir) DOSFS_CloseDir( info->dir );
if (info->path) HeapFree( GetProcessHeap(), 0, info->path );
if ((info = (FIND_FIRST_INFO *)GlobalLock( handle )))
{
if (info->dir) DOSFS_CloseDir( info->dir );
if (info->path) HeapFree( GetProcessHeap(), 0, info->path );
}
}
__EXCEPT(page_fault)
{
@ -1824,9 +1823,14 @@ BOOL WINAPI FindClose( HANDLE handle )
return FALSE;
}
__ENDTRY
if (!info) goto error;
GlobalUnlock( handle );
GlobalFree( handle );
return TRUE;
error:
SetLastError( ERROR_INVALID_HANDLE );
return FALSE;
}
/***********************************************************************