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

Fix possible crash in emoji suggestions. 

Fixes #6652, fixes #6654.
This commit is contained in:
John Preston 2019-10-07 12:35:49 +03:00
parent 60b39c8f7e
commit 55d5f6e03d
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Telegram/SourceFiles/chat_helpers/emoji_keywords.cpp
View File

@ -170,7 +170,7 @@ void AppendFoundEmoji(
const std::vector<LangPackEmoji> &list) { const std::vector<LangPackEmoji> &list) {
// It is important that the 'result' won't relocate while inserting. // It is important that the 'result' won't relocate while inserting.
result.reserve(result.size() + list.size()); result.reserve(result.size() + list.size());
const auto alreadyBegin = result.data(); const auto alreadyBegin = begin(result);
const auto alreadyEnd = alreadyBegin + result.size(); const auto alreadyEnd = alreadyBegin + result.size();
auto &&add = ranges::view::all( auto &&add = ranges::view::all(
@ -204,6 +204,12 @@ void AppendLegacySuggestions(
} }
const auto suggestions = GetSuggestions(QStringToUTF16(query)); const auto suggestions = GetSuggestions(QStringToUTF16(query));
// It is important that the 'result' won't relocate while inserting.
result.reserve(result.size() + suggestions.size());
const auto alreadyBegin = begin(result);
const auto alreadyEnd = alreadyBegin + result.size();
auto &&add = ranges::view::all( auto &&add = ranges::view::all(
suggestions suggestions
) | ranges::view::transform([](const Suggestion &suggestion) { ) | ranges::view::transform([](const Suggestion &suggestion) {
@ -214,10 +220,14 @@ void AppendLegacySuggestions(
}; };
}) | ranges::view::filter([&](const Result &entry) { }) | ranges::view::filter([&](const Result &entry) {
const auto i = entry.emoji const auto i = entry.emoji
? ranges::find(result, entry.emoji, &Result::emoji) ? ranges::find(
: end(result); alreadyBegin,
alreadyEnd,
entry.emoji,
&Result::emoji)
: alreadyEnd;
return (entry.emoji != nullptr) return (entry.emoji != nullptr)
&& (i == end(result)); && (i == alreadyEnd);
}); });
result.insert(end(result), add.begin(), add.end()); result.insert(end(result), add.begin(), add.end());
} }
@ -593,21 +603,24 @@ std::vector<Result> EmojiKeywords::query(
} }
auto result = std::vector<Result>(); auto result = std::vector<Result>();
for (const auto &[language, item] : _data) { for (const auto &[language, item] : _data) {
const auto oldcount = result.size();
const auto list = item->query(normalized, exact); const auto list = item->query(normalized, exact);
// It is important that the 'result' won't relocate while inserting.
result.reserve(result.size() + list.size());
const auto alreadyBegin = begin(result);
const auto alreadyEnd = alreadyBegin + result.size();
auto &&add = ranges::view::all( auto &&add = ranges::view::all(
list list
) | ranges::view::filter([&](Result entry) { ) | ranges::view::filter([&](Result entry) {
// In each item->query() result the list has no duplicates. // In each item->query() result the list has no duplicates.
// So we need to check only for duplicates between queries. // So we need to check only for duplicates between queries.
const auto oldbegin = begin(result);
const auto oldend = oldbegin + oldcount;
const auto i = ranges::find( const auto i = ranges::find(
oldbegin, alreadyBegin,
oldend, alreadyEnd,
entry.emoji, entry.emoji,
&Result::emoji); &Result::emoji);
return (i == oldend); return (i == alreadyEnd);
}); });
result.insert(end(result), add.begin(), add.end()); result.insert(end(result), add.begin(), add.end());
} }