From c8f3573ca5e02951ab1eabbba37222f9c66360cb Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sun, 6 Jan 2019 21:26:19 +0300
Subject: [PATCH] Do not try to attach stickers not from sticker sets.

GitOrigin-RevId: e5ae71d7e47ab5e055ecdafd22a0cbe77c19ab71
---
 td/telegram/StickersManager.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/td/telegram/StickersManager.cpp b/td/telegram/StickersManager.cpp
index 9532ff0f..92bab247 100644
--- a/td/telegram/StickersManager.cpp
+++ b/td/telegram/StickersManager.cpp
@@ -3445,22 +3445,28 @@ vector<FileId> StickersManager::get_attached_sticker_file_ids(const vector<int32
   result.reserve(int_file_ids.size());
   for (auto int_file_id : int_file_ids) {
     FileId file_id(int_file_id, 0);
-    if (get_sticker(file_id) == nullptr) {
+    const Sticker *s = get_sticker(file_id);
+    if (s == nullptr) {
       LOG(WARNING) << "Can't find sticker " << file_id;
       continue;
     }
+    if (s->set_id == 0) {
+      // only stickers from sticker sets can be attached to files
+      continue;
+    }
+
     auto file_view = td_->file_manager_->get_file_view(file_id);
     CHECK(!file_view.empty());
     if (!file_view.has_remote_location()) {
-      LOG(WARNING) << "Sticker " << file_id << " has no remote location";
+      LOG(ERROR) << "Sticker " << file_id << " has no remote location";
       continue;
     }
     if (file_view.remote_location().is_web()) {
-      LOG(WARNING) << "Sticker " << file_id << " is web";
+      LOG(ERROR) << "Sticker " << file_id << " is web";
       continue;
     }
     if (!file_view.remote_location().is_document()) {
-      LOG(WARNING) << "Sticker " << file_id << " is encrypted";
+      LOG(ERROR) << "Sticker " << file_id << " is encrypted";
       continue;
     }
     result.push_back(file_id);