mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-28 10:48:19 +03:00
Code Issues Projects Releases Packages Wiki Activity

Perform type conversion properly

Browse source 
Closes #19521.
PR #19525.
This commit is contained in:
Chocobo1 2023-09-01 00:18:03 +08:00
parent c77466abb0
commit 604986e90f
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/base/utils/io.cpp
View file

@ -28,6 +28,8 @@
#include "io.h" #include "io.h"
#include <limits>
#include <libtorrent/bencode.hpp> #include <libtorrent/bencode.hpp>
#include <libtorrent/entry.hpp> #include <libtorrent/entry.hpp>
@ -89,11 +91,20 @@ nonstd::expected<QByteArray, Utils::IO::ReadError> Utils::IO::readFile(const Pat
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message}); return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
} }
#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QByteArray ret {fileSize, Qt::Uninitialized}; using ByteArraySizeType = qsizetype;
#else #else
QByteArray ret {static_cast<int>(fileSize), Qt::Uninitialized}; using ByteArraySizeType = int;
#endif #endif
if ((fileSize < std::numeric_limits<ByteArraySizeType>::min())
|| (fileSize > std::numeric_limits<ByteArraySizeType>::max()))
{
const QString message = QCoreApplication::translate("Utils::IO", "File size exceeds data size limit. File: \"%1\". File size: %2. Array limit: %3")
.arg(file.fileName(), QString::number(fileSize), QString::number(std::numeric_limits<ByteArraySizeType>::max()));
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
}
QByteArray ret {static_cast<ByteArraySizeType>(fileSize), Qt::Uninitialized};
const qint64 actualSize = file.read(ret.data(), fileSize); const qint64 actualSize = file.read(ret.data(), fileSize);
if (actualSize < 0) if (actualSize < 0)