Zipper: added an overflow check to make sure to produce a valid zip (next step is to implement zip64)
This commit is contained in:
@@ -176,8 +176,22 @@ namespace Zip
|
||||
throw ZipperException {"Cannot get file size for '" + filePath.string() + "': " + ec.message()};
|
||||
|
||||
_files[filename] = std::move(fileContext);
|
||||
|
||||
_totalZipSize += LocalFileHeader::getHeaderSize();
|
||||
_totalZipSize += filename.size();
|
||||
if (fileContext.fileSize > 0)
|
||||
{
|
||||
_totalZipSize += fileContext.fileSize;
|
||||
_totalZipSize += DataDescriptor::getHeaderSize();
|
||||
_totalZipSize += CentralDirectoryHeader::getHeaderSize();
|
||||
_totalZipSize += filename.size();
|
||||
}
|
||||
}
|
||||
|
||||
_totalZipSize += EndOfCentralDirectoryRecord::getHeaderSize();
|
||||
if (_totalZipSize > UINT32_MAX)
|
||||
throw ZipperException {"Cannot create a zip file which is larger than " + std::to_string(UINT32_MAX) + " bytes!"};
|
||||
|
||||
_currentFile = std::begin(_files);
|
||||
}
|
||||
|
||||
|
||||
@@ -39,12 +39,16 @@ namespace Zip
|
||||
{
|
||||
public:
|
||||
|
||||
using SizeZype = std::uint64_t;
|
||||
|
||||
Zipper(const std::map<std::string, std::filesystem::path>& files);
|
||||
|
||||
static constexpr std::size_t minOutputBufferSize = 64;
|
||||
std::size_t writeSome(std::byte* buffer, std::size_t bufferSize);
|
||||
bool isComplete() const;
|
||||
|
||||
SizeZype getTotalZipFile() const { return _totalZipSize; }
|
||||
|
||||
private:
|
||||
void setComplete();
|
||||
|
||||
@@ -79,6 +83,7 @@ namespace Zip
|
||||
Complete,
|
||||
};
|
||||
|
||||
SizeZype _totalZipSize {};
|
||||
WriteState _writeState {WriteState::LocalFileHeader};
|
||||
FileContainer::iterator _currentFile;
|
||||
std::size_t _currentOffset {};
|
||||
|
||||
Reference in New Issue
Block a user