mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 22:46:10 +00:00
Code Issues Releases Wiki Activity

Fix possible crash in DomainResolver.

Browse Source 
App::CallDelayed() could be queued twice for a single key, if before
the delayed call we cleared entry in _attempts and created it again.
This commit is contained in:
John Preston
2019-03-20 13:23:14 +04:00
parent 8acd47bf2f
commit a59353df9f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Telegram/SourceFiles/mtproto/special_config_request.cpp
View File

@@ -453,7 +453,7 @@ void DomainResolver::resolve(const AttemptKey &key) {
auto hosts = DnsDomains();
std::random_device rd;
ranges::shuffle(hosts, std::mt19937(rd()));
_attempts.emplace(key, std::move(hosts));
_attempts.emplace(key, Attempts{ std::move(hosts) });
sendNextRequest(key);
}
@@ -478,12 +478,13 @@ void DomainResolver::sendNextRequest(const AttemptKey &key) {
if (i == end(_attempts)) {
return;
}
auto &hosts = i->second;
auto &attempts = i->second;
auto &hosts = attempts.hosts;
const auto host = hosts.back();
hosts.pop_back();
if (!hosts.empty()) {
App::CallDelayed(kSendNextTimeout, this, [=] {
App::CallDelayed(kSendNextTimeout, &attempts.guard, [=] {
sendNextRequest(key);
});
}