ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check access rights before renaming or deleting files (based on

Browse Source 
patches by Uwe Bonnes and Dmitry Timoshkov).
This commit is contained in:
Alexandre Julliard 2002-06-05 00:47:38 +00:00
parent ccab28771b
commit 034e39b2fe
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/kernel/tests/file.c
View File

@ -49,6 +49,8 @@ static void test__hread( void )
long bytes_wanted; long bytes_wanted;
UINT i; UINT i;
SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); /* be sure to remove stale files */
DeleteFileA( filename );
filehandle = _lcreat( filename, 0 ); filehandle = _lcreat( filename, 0 );
if (filehandle == HFILE_ERROR) if (filehandle == HFILE_ERROR)
{ {
@ -224,14 +226,11 @@ static void test__lcreat( void )
ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should be able to find file" ); ok( INVALID_HANDLE_VALUE != FindFirstFileA( filename, &search_results ), "should be able to find file" );
todo_wine ok( 0 == DeleteFileA( filename ), "shouldn't be able to delete a readonly file" );
{
ok( 0 == DeleteFileA( filename ), "shouldn't be able to delete a readonly file" );
ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file" ); ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file" );
ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file!" ); ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file!" );
}
filehandle = _lcreat( filename, 2 ); filehandle = _lcreat( filename, 2 );
ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)", filename, GetLastError( ) ); ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)", filename, GetLastError( ) );

26
files/file.c
View File

@ -2149,6 +2149,7 @@ BOOL16 WINAPI DeleteFile16( LPCSTR path )
BOOL WINAPI DeleteFileA( LPCSTR path ) BOOL WINAPI DeleteFileA( LPCSTR path )
{ {
DOS_FULL_NAME full_name; DOS_FULL_NAME full_name;
HANDLE hFile;
if (!path) if (!path)
{ {
@ -2170,11 +2171,20 @@ BOOL WINAPI DeleteFileA( LPCSTR path )
} }
if (!DOSFS_GetFullName( path, TRUE, &full_name )) return FALSE; if (!DOSFS_GetFullName( path, TRUE, &full_name )) return FALSE;
/* check if we are allowed to delete the source */
hFile = FILE_CreateFile( full_name.long_name, GENERIC_READ|GENERIC_WRITE, 0,
NULL, OPEN_EXISTING, 0, 0, TRUE,
GetDriveTypeA( full_name.short_name ) );
if (!hFile) return FALSE;
if (unlink( full_name.long_name ) == -1) if (unlink( full_name.long_name ) == -1)
{ {
FILE_SetDosError(); FILE_SetDosError();
CloseHandle(hFile);
return FALSE; return FALSE;
} }
CloseHandle(hFile);
return TRUE; return TRUE;
} }
@ -2317,6 +2327,7 @@ static BOOL FILE_AddBootRenameEntry( const char *fn1, const char *fn2, DWORD fla
BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag ) BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag )
{ {
DOS_FULL_NAME full_name1, full_name2; DOS_FULL_NAME full_name1, full_name2;
HANDLE hFile;
TRACE("(%s,%s,%04lx)\n", fn1, fn2, flag); TRACE("(%s,%s,%04lx)\n", fn1, fn2, flag);
@ -2385,6 +2396,21 @@ BOOL WINAPI MoveFileExA( LPCSTR fn1, LPCSTR fn2, DWORD flag )
return FILE_AddBootRenameEntry( fn1, fn2, flag ); return FILE_AddBootRenameEntry( fn1, fn2, flag );
} }
/* check if we are allowed to delete the source */
hFile = FILE_CreateFile( full_name1.long_name, GENERIC_READ|GENERIC_WRITE, 0,
NULL, OPEN_EXISTING, 0, 0, TRUE,
GetDriveTypeA( full_name1.short_name ) );
if (!hFile) return FALSE;
CloseHandle(hFile);
/* check, if we are allowed to delete the destination,
** (but the file not being there is fine) */
hFile = FILE_CreateFile( full_name2.long_name, GENERIC_READ|GENERIC_WRITE, 0,
NULL, OPEN_EXISTING, 0, 0, TRUE,
GetDriveTypeA( full_name2.short_name ) );
if(!hFile && GetLastError() != ERROR_FILE_NOT_FOUND) return FALSE;
CloseHandle(hFile);
if (full_name1.drive != full_name2.drive) if (full_name1.drive != full_name2.drive)
{ {
/* use copy, if allowed */ /* use copy, if allowed */