d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 01:44:26 +00:00
Code Issues Projects Releases 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 committed by GitHub
parent e434812cda
commit 24da51ffa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base/utils/io.cpp
View File

@ -28,6 +28,9 @@
#include "io.h" #include "io.h"
#include <limits>
#include <utility>
#include <libtorrent/bencode.hpp> #include <libtorrent/bencode.hpp>
#include <libtorrent/entry.hpp> #include <libtorrent/entry.hpp>
@ -88,8 +91,14 @@ nonstd::expected<QByteArray, Utils::IO::ReadError> Utils::IO::readFile(const Pat
.arg(file.fileName(), QString::number(fileSize), QString::number(maxSize)); .arg(file.fileName(), QString::number(fileSize), QString::number(maxSize));
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message}); return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
} }
if (!std::in_range<qsizetype>(fileSize))
{
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<qsizetype>::max()));
return nonstd::make_unexpected(ReadError {ReadError::ExceedSize, message});
}
QByteArray ret {fileSize, Qt::Uninitialized}; QByteArray ret {static_cast<qsizetype>(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)