zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #348 from Laupetin/fix/t6-long-fastfile-names

Browse Source 
fix: long fastfile names
This commit is contained in:
Jan 2025-01-15 01:09:57 +01:00 committed by GitHub
commit 64bac44e63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneCommon/Zone/XChunk/AbstractSalsa20Processor.cpp
View File

@ -21,7 +21,9 @@ uint8_t* AbstractSalsa20Processor::GetHashBlock(const int streamNumber) const
void AbstractSalsa20Processor::InitStreams(const std::string& zoneName, const uint8_t* salsa20Key, const size_t keySize) const void AbstractSalsa20Processor::InitStreams(const std::string& zoneName, const uint8_t* salsa20Key, const size_t keySize) const
{ {
const auto zoneNameLength = zoneName.length(); // Original buffer must have been 32 bytes because the zoneName can at most be 31 characters be long before being cut off
const auto zoneNameLength = std::min(zoneName.length(), 31u);
const size_t blockHashBufferSize = BLOCK_HASHES_COUNT * m_stream_count * SHA1_HASH_SIZE; const size_t blockHashBufferSize = BLOCK_HASHES_COUNT * m_stream_count * SHA1_HASH_SIZE;
assert(blockHashBufferSize % 4 == 0); assert(blockHashBufferSize % 4 == 0);

6
src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp
View File

@ -1,6 +1,8 @@
#include "InvalidFileNameException.h" #include "InvalidFileNameException.h"
InvalidFileNameException::InvalidFileNameException(std::string& actualFileName, std::string& expectedFileName) #include <format>
InvalidFileNameException::InvalidFileNameException(const std::string& actualFileName, const std::string& expectedFileName)
{ {
m_actual_file_name = actualFileName; m_actual_file_name = actualFileName;
m_expected_file_name = expectedFileName; m_expected_file_name = expectedFileName;
@ -8,7 +10,7 @@ InvalidFileNameException::InvalidFileNameException(std::string& actualFileName,
std::string InvalidFileNameException::DetailedMessage() std::string InvalidFileNameException::DetailedMessage()
{ {
return "Name verification failed: The fastfile was created as '" + m_expected_file_name + "' but loaded as '" + m_actual_file_name + "'"; return std::format("Name verification failed: The fastfile was created as '{}' but loaded as '{}'", m_expected_file_name, m_actual_file_name);
} }
char const* InvalidFileNameException::what() const noexcept char const* InvalidFileNameException::what() const noexcept

8
src/ZoneLoading/Loading/Exception/InvalidFileNameException.h
View File

@ -3,12 +3,12 @@
class InvalidFileNameException final : public LoadingException class InvalidFileNameException final : public LoadingException
{ {
std::string m_actual_file_name;
std::string m_expected_file_name;
public: public:
InvalidFileNameException(std::string& actualFileName, std::string& expectedFileName); InvalidFileNameException(const std::string& actualFileName, const std::string& expectedFileName);
std::string DetailedMessage() override; std::string DetailedMessage() override;
char const* what() const noexcept override; char const* what() const noexcept override;
std::string m_actual_file_name;
std::string m_expected_file_name;
}; };

13
src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp
View File

@ -5,12 +5,11 @@
#include <sstream> #include <sstream>
StepVerifyFileName::StepVerifyFileName(std::string fileName, const size_t fileNameBufferSize) StepVerifyFileName::StepVerifyFileName(std::string fileName, const size_t fileNameBufferSize)
: m_expected_file_name(std::move(fileName)),
m_file_name_buffer_size(fileNameBufferSize)
{ {
m_file_name = std::move(fileName); if (m_expected_file_name.length() > (m_file_name_buffer_size - 1))
m_file_name_buffer_size = fileNameBufferSize; m_expected_file_name.erase(m_file_name_buffer_size - 1);
if (m_file_name.length() > m_file_name_buffer_size)
m_file_name.erase(m_file_name_buffer_size);
} }
void StepVerifyFileName::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* stream) void StepVerifyFileName::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* stream)
@ -42,6 +41,6 @@ void StepVerifyFileName::PerformStep(ZoneLoader* zoneLoader, ILoadingStream* str
std::string originalFileName = originalFilenameStream.str(); std::string originalFileName = originalFilenameStream.str();
if (originalFileName != m_file_name) if (originalFileName != m_expected_file_name)
throw InvalidFileNameException(m_file_name, originalFileName); throw InvalidFileNameException(m_expected_file_name, originalFileName);
} }

2
src/ZoneLoading/Loading/Steps/StepVerifyFileName.h
View File

@ -4,7 +4,7 @@
class StepVerifyFileName final : public ILoadingStep class StepVerifyFileName final : public ILoadingStep
{ {
std::string m_file_name; std::string m_expected_file_name;
size_t m_file_name_buffer_size; size_t m_file_name_buffer_size;
public: public: