mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-29 06:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix Issue 16218 - Windows std.file.readImpl should be marked @system.

Browse source
This commit is contained in:
vladchicos 2021-08-01 14:59:39 +03:00
parent 1a0e4e7965
commit f3be11dc29
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
std/file.d
View file

@ -402,24 +402,24 @@ version (Posix) private void[] readImpl(scope const(char)[] name, scope const(FS
version (Windows) private void[] readImpl(scope const(char)[] name, scope const(FSChar)* namez, version (Windows) private void[] readImpl(scope const(char)[] name, scope const(FSChar)* namez,
size_t upTo = size_t.max) @safe size_t upTo = size_t.max) @system
{ {
import core.memory : GC; import core.memory : GC;
import std.algorithm.comparison : min; import std.algorithm.comparison : min;
static trustedCreateFileW(scope const(wchar)* namez, DWORD dwDesiredAccess, DWORD dwShareMode, static trustedCreateFileW(scope const(wchar)* namez, DWORD dwDesiredAccess, DWORD dwShareMode,
SECURITY_ATTRIBUTES *lpSecurityAttributes, DWORD dwCreationDisposition, SECURITY_ATTRIBUTES *lpSecurityAttributes, DWORD dwCreationDisposition,
DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) @trusted DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
{ {
return CreateFileW(namez, dwDesiredAccess, dwShareMode, return CreateFileW(namez, dwDesiredAccess, dwShareMode,
lpSecurityAttributes, dwCreationDisposition, lpSecurityAttributes, dwCreationDisposition,
dwFlagsAndAttributes, hTemplateFile); dwFlagsAndAttributes, hTemplateFile);
} }
static trustedCloseHandle(HANDLE hObject) @trusted static trustedCloseHandle(HANDLE hObject)
{ {
return CloseHandle(hObject); return CloseHandle(hObject);
} }
static trustedGetFileSize(HANDLE hFile, out ulong fileSize) @trusted static trustedGetFileSize(HANDLE hFile, out ulong fileSize)
{ {
DWORD sizeHigh; DWORD sizeHigh;
DWORD sizeLow = GetFileSize(hFile, &sizeHigh); DWORD sizeLow = GetFileSize(hFile, &sizeHigh);
@ -428,7 +428,7 @@ version (Windows) private void[] readImpl(scope const(char)[] name, scope const(
fileSize = makeUlong(sizeLow, sizeHigh); fileSize = makeUlong(sizeLow, sizeHigh);
return result; return result;
} }
static trustedReadFile(HANDLE hFile, void *lpBuffer, ulong nNumberOfBytesToRead) @trusted static trustedReadFile(HANDLE hFile, void *lpBuffer, ulong nNumberOfBytesToRead)
{ {
// Read by chunks of size < 4GB (Windows API limit) // Read by chunks of size < 4GB (Windows API limit)
ulong totalNumRead = 0; ulong totalNumRead = 0;
@ -456,11 +456,11 @@ version (Windows) private void[] readImpl(scope const(char)[] name, scope const(
ulong fileSize = void; ulong fileSize = void;
cenforce(trustedGetFileSize(h, fileSize), name, namez); cenforce(trustedGetFileSize(h, fileSize), name, namez);
size_t size = min(upTo, fileSize); size_t size = min(upTo, fileSize);
auto buf = () @trusted { return GC.malloc(size, GC.BlkAttr.NO_SCAN)[0 .. size]; } (); auto buf = () { return GC.malloc(size, GC.BlkAttr.NO_SCAN)[0 .. size]; } ();
scope(failure) scope(failure)
{ {
() @trusted { GC.free(buf.ptr); } (); () { GC.free(buf.ptr); } ();
} }
if (size) if (size)