procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash if asked to read more than 64MB at once.

This commit is contained in:
John Preston 2019-03-14 14:14:24 +04:00
parent 0d888eea85
commit feb238c5d9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
View File

@ -12,6 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Media { namespace Media {
namespace Streaming { namespace Streaming {
namespace {
constexpr auto kMaxSingleReadAmount = 8 * 1024 * 1024;
} // namespace
File::Context::Context( File::Context::Context(
not_null<FileDelegate*> delegate, not_null<FileDelegate*> delegate,
@ -32,7 +37,13 @@ int64_t File::Context::Seek(void *opaque, int64_t offset, int whence) {
int File::Context::read(bytes::span buffer) { int File::Context::read(bytes::span buffer) {
const auto amount = std::min(size_type(_size - _offset), buffer.size()); const auto amount = std::min(size_type(_size - _offset), buffer.size());
if (unroll() || amount < 0) { Assert(amount >= 0);
if (unroll()) {
return -1;
} else if (amount > kMaxSingleReadAmount) {
LOG(("Streaming Error: Read callback asked for too much data: %1"
).arg(amount));
return -1; return -1;
} else if (!amount) { } else if (!amount) {
return amount; return amount;