games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Fix possible leak due to usage of raw pointers in filesystem

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-27 19:55:16 +03:00
parent 3547635c05
commit 4bafab9ad4
10 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/filesystem/CCompressedStream.cpp
View File

@@ -97,7 +97,7 @@ CCompressedStream::CCompressedStream(std::unique_ptr<CInputStream> stream, bool
assert(gzipStream);
// Allocate inflate state
inflateState = new z_stream();
inflateState = std::make_unique<z_stream>();
inflateState->zalloc = Z_NULL;
inflateState->zfree = Z_NULL;
inflateState->opaque = Z_NULL;
@@ -108,15 +108,14 @@ CCompressedStream::CCompressedStream(std::unique_ptr<CInputStream> stream, bool
if (gzip)
wbits += 16;
int ret = inflateInit2(inflateState, wbits);
int ret = inflateInit2(inflateState.get(), wbits);
if (ret != Z_OK)
throw std::runtime_error("Failed to initialize inflate!\n");
}
CCompressedStream::~CCompressedStream()
{
inflateEnd(inflateState);
vstd::clear_pointer(inflateState);
inflateEnd(inflateState.get());
}
si64 CCompressedStream::readMore(ui8 *data, si64 size)
@@ -149,7 +148,7 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
inflateState->next_in = compressedBuffer.data();
}
int ret = inflate(inflateState, Z_NO_FLUSH);
int ret = inflate(inflateState.get(), Z_NO_FLUSH);
if (inflateState->avail_in == 0 && gzipStream == nullptr)
fileEnded = true;
@@ -179,8 +178,8 @@ si64 CCompressedStream::readMore(ui8 *data, si64 size)
// Clean up and return
if (fileEnded)
{
inflateEnd(inflateState);
vstd::clear_pointer(inflateState);
inflateEnd(inflateState.get());
inflateState.reset();
}
return decompressed;
}
@@ -190,7 +189,7 @@ bool CCompressedStream::getNextBlock()
if (!inflateState)
return false;
if (inflateReset(inflateState) < 0)
if (inflateReset(inflateState.get()) < 0)
return false;
reset();