generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 02:53:10 +01:00
Code Issues Projects Releases Wiki Activity

[SF 2835206] File_WIN32 not checking against INVALID_HANDLE_VALUE

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2009-08-12 11:34:44 +00:00
parent 49101951a2
commit 1bd3511e89
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Foundation/src/File_WIN32.cpp
View File

@@ -48,13 +48,16 @@ class FileHandle
public: public:
FileHandle(const std::string& path, DWORD access, DWORD share, DWORD disp) FileHandle(const std::string& path, DWORD access, DWORD share, DWORD disp)
{ {
_h = CreateFileA(path.c_str(), access, share, 0, disp, 0, 0); _h = CreateFileA(upath.c_str(), access, share, 0, disp, 0, 0);
if (!_h) FileImpl::handleLastErrorImpl(path); if (_h == INVALID_HANDLE_VALUE)
{
FileImpl::handleLastErrorImpl(path);
}
} }
~FileHandle() ~FileHandle()
{ {
if (_h) CloseHandle(_h); if (_h != INVALID_HANDLE_VALUE) CloseHandle(_h);
} }
HANDLE get() const HANDLE get() const

7
Foundation/src/File_WIN32U.cpp
View File

@@ -50,12 +50,15 @@ public:
FileHandle(const std::string& path, const std::wstring& upath, DWORD access, DWORD share, DWORD disp) FileHandle(const std::string& path, const std::wstring& upath, DWORD access, DWORD share, DWORD disp)
{ {
_h = CreateFileW(upath.c_str(), access, share, 0, disp, 0, 0); _h = CreateFileW(upath.c_str(), access, share, 0, disp, 0, 0);
if (!_h) FileImpl::handleLastErrorImpl(path); if (_h == INVALID_HANDLE_VALUE)
{
FileImpl::handleLastErrorImpl(path);
}
} }
~FileHandle() ~FileHandle()
{ {
if (_h) CloseHandle(_h); if (_h != INVALID_HANDLE_VALUE) CloseHandle(_h);
} }
HANDLE get() const HANDLE get() const