tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check sticker pointer before use.

Browse Source
This commit is contained in:
levlam 2021-11-14 09:05:33 +03:00
parent 5e70be9d36
commit ed56a75b8a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
td/telegram/StickersManager.cpp
View File

@ -3173,6 +3173,7 @@ vector<FileId> StickersManager::get_stickers(string emoji, int32 limit, bool for
auto prefer_animated = [this](FileId lhs, FileId rhs) { auto prefer_animated = [this](FileId lhs, FileId rhs) {
const Sticker *lhs_s = get_sticker(lhs); const Sticker *lhs_s = get_sticker(lhs);
const Sticker *rhs_s = get_sticker(rhs); const Sticker *rhs_s = get_sticker(rhs);
CHECK(lhs_s != nullptr && rhs_s != nullptr);
return lhs_s->is_animated && !rhs_s->is_animated; return lhs_s->is_animated && !rhs_s->is_animated;
}; };
// std::stable_sort(prepend_sticker_ids.begin(), prepend_sticker_ids.begin() + recent_sticker_ids_[0].size(), // std::stable_sort(prepend_sticker_ids.begin(), prepend_sticker_ids.begin() + recent_sticker_ids_[0].size(),
@ -3183,6 +3184,7 @@ vector<FileId> StickersManager::get_stickers(string emoji, int32 limit, bool for
LOG(INFO) << "Have " << recent_sticker_ids_[0] << " recent and " << favorite_sticker_ids_ << " favorite stickers"; LOG(INFO) << "Have " << recent_sticker_ids_[0] << " recent and " << favorite_sticker_ids_ << " favorite stickers";
for (const auto &sticker_id : prepend_sticker_ids) { for (const auto &sticker_id : prepend_sticker_ids) {
const Sticker *s = get_sticker(sticker_id); const Sticker *s = get_sticker(sticker_id);
CHECK(s != nullptr);
LOG(INFO) << "Have prepend sticker " << sticker_id << " from " << s->set_id; LOG(INFO) << "Have prepend sticker " << sticker_id << " from " << s->set_id;
if (s->set_id.is_valid() && !td::contains(sets_to_load, s->set_id)) { if (s->set_id.is_valid() && !td::contains(sets_to_load, s->set_id)) {
const StickerSet *sticker_set = get_sticker_set(s->set_id); const StickerSet *sticker_set = get_sticker_set(s->set_id);
@ -3269,6 +3271,7 @@ vector<FileId> StickersManager::get_stickers(string emoji, int32 limit, bool for
is_good = true; is_good = true;
} else { } else {
const Sticker *s = get_sticker(sticker_id); const Sticker *s = get_sticker(sticker_id);
CHECK(s != nullptr);
if (remove_emoji_modifiers(s->alt) == emoji) { if (remove_emoji_modifiers(s->alt) == emoji) {
LOG(INFO) << "Found prepend sticker " << sticker_id << " main emoji matches"; LOG(INFO) << "Found prepend sticker " << sticker_id << " main emoji matches";
is_good = true; is_good = true;