WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix memory leak

Browse Source
This commit is contained in:
elasota
2021-05-11 01:29:40 -04:00
parent 0def879db1
commit 295db5f064
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Aerofoil/GpFileStream_Win32.cpp
View File

@@ -1,13 +1,32 @@
#include "GpFileStream_Win32.h" #include "GpFileStream_Win32.h"
#include "IGpAllocator.h"
GpFileStream_Win32::GpFileStream_Win32(HANDLE handle, bool readable, bool writeable, bool seekable) #include <new>
: m_handle(handle)
GpFileStream_Win32::GpFileStream_Win32(IGpAllocator *alloc, HANDLE handle, bool readable, bool writeable, bool seekable)
: m_alloc(alloc)
, m_handle(handle)
, m_readable(readable) , m_readable(readable)
, m_writeable(writeable) , m_writeable(writeable)
, m_seekable(seekable) , m_seekable(seekable)
{ {
} }
GpFileStream_Win32 *GpFileStream_Win32::Create(IGpAllocator *alloc, HANDLE handle, bool readable, bool writeable, bool seekable)
{
void *storage = alloc->Alloc(sizeof(GpFileStream_Win32));
if (!storage)
return nullptr;
return new (storage) GpFileStream_Win32(alloc, handle, readable, writeable, seekable);
}
GpFileStream_Win32::~GpFileStream_Win32()
{
CloseHandle(m_handle);
}
size_t GpFileStream_Win32::Read(void *bytesOut, size_t size) size_t GpFileStream_Win32::Read(void *bytesOut, size_t size)
{ {
if (!m_readable) if (!m_readable)
@@ -122,7 +141,10 @@ GpUFilePos_t GpFileStream_Win32::Tell() const
void GpFileStream_Win32::Close() void GpFileStream_Win32::Close()
{ {
CloseHandle(m_handle); IGpAllocator *alloc = m_alloc;
this->~GpFileStream_Win32();
alloc->Release(this);
} }
void GpFileStream_Win32::Flush() void GpFileStream_Win32::Flush()

7
Aerofoil/GpFileStream_Win32.h
View File

@@ -7,7 +7,7 @@
class GpFileStream_Win32 final : public GpIOStream class GpFileStream_Win32 final : public GpIOStream
{ {
public: public:
explicit GpFileStream_Win32(HANDLE handle, bool readable, bool writeable, bool seekable); ~GpFileStream_Win32();
size_t Read(void *bytesOut, size_t size) override; size_t Read(void *bytesOut, size_t size) override;
size_t Write(const void *bytes, size_t size) override; size_t Write(const void *bytes, size_t size) override;
@@ -26,7 +26,12 @@ public:
void Close(); void Close();
#endif #endif
static GpFileStream_Win32 *Create(IGpAllocator *alloc, HANDLE handle, bool readable, bool writeable, bool seekable);
private: private:
GpFileStream_Win32(IGpAllocator *alloc, HANDLE handle, bool readable, bool writeable, bool seekable);
IGpAllocator *m_alloc;
HANDLE m_handle; HANDLE m_handle;
bool m_readable; bool m_readable;
bool m_writeable; bool m_writeable;

2
Aerofoil/GpFileSystem_Win32.cpp
View File

@@ -290,7 +290,7 @@ GpIOStream *GpFileSystem_Win32::OpenFileNested(PortabilityLayer::VirtualDirector
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
return false; return false;
return new GpFileStream_Win32(h, true, writeAccess, true); return GpFileStream_Win32::Create(m_alloc, h, true, writeAccess, true);
} }
bool GpFileSystem_Win32::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed) bool GpFileSystem_Win32::DeleteFile(PortabilityLayer::VirtualDirectory_t virtualDirectory, const char *path, bool &existed)