andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Do not return InputMedia with expired file reference.

Browse Source 
GitOrigin-RevId: 5eebe93c45791caee18724572180fcc0cb3a4c6c
This commit is contained in:
levlam 2019-01-25 17:33:24 +03:00
parent 0fcf95dbbe
commit c82e983495
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/MessageContent.cpp
View File

@ -2105,8 +2105,9 @@ tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *co
bool had_input_file = input_file != nullptr; bool had_input_file = input_file != nullptr;
bool had_input_thumbnail = input_thumbnail != nullptr; bool had_input_thumbnail = input_thumbnail != nullptr;
auto input_media = get_input_media(content, td, std::move(input_file), std::move(input_thumbnail), ttl); auto input_media = get_input_media(content, td, std::move(input_file), std::move(input_thumbnail), ttl);
auto was_uploaded = FileManager::extract_was_uploaded(input_media);
if (had_input_file) { if (had_input_file) {
if (!FileManager::extract_was_uploaded(input_media)) { if (!was_uploaded) {
// if we had InputFile, but has failed to use it, then we need to immediately cancel file upload // if we had InputFile, but has failed to use it, then we need to immediately cancel file upload
// so the next upload with the same file can succeed // so the next upload with the same file can succeed
CHECK(file_id.is_valid()); CHECK(file_id.is_valid());
@ -2119,6 +2120,12 @@ tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *co
} else { } else {
CHECK(!had_input_thumbnail); CHECK(!had_input_thumbnail);
} }
if (!was_uploaded) {
auto file_reference = FileManager::extract_file_reference(input_media);
if (file_reference == FullRemoteFileLocation::invalid_file_reference()) {
return nullptr;
}
}
return input_media; return input_media;
} }