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

Early check for dialog_id correctness.

Browse Source
This commit is contained in:
levlam 2021-11-29 22:13:06 +03:00
parent b8d20ca6bb
commit 4d9268c302
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessagesManager.cpp
View File

@ -35830,7 +35830,9 @@ MessagesManager::Dialog *MessagesManager::get_dialog_force(DialogId dialog_id, c
auto it = dialogs_.find(dialog_id); auto it = dialogs_.find(dialog_id);
if (it != dialogs_.end()) { if (it != dialogs_.end()) {
return it->second.get(); Dialog *d = it->second.get();
LOG_CHECK(d->dialog_id == dialog_id) << d->dialog_id << ' ' << dialog_id;
return d;
} }
if (!dialog_id.is_valid() || !G()->parameters().use_message_db || loaded_dialogs_.count(dialog_id) > 0) { if (!dialog_id.is_valid() || !G()->parameters().use_message_db || loaded_dialogs_.count(dialog_id) > 0) {
@ -35841,7 +35843,7 @@ MessagesManager::Dialog *MessagesManager::get_dialog_force(DialogId dialog_id, c
if (r_value.is_ok()) { if (r_value.is_ok()) {
LOG(INFO) << "Loaded " << dialog_id << " from database from " << source; LOG(INFO) << "Loaded " << dialog_id << " from database from " << source;
auto d = on_load_dialog_from_database(dialog_id, r_value.move_as_ok(), source); auto d = on_load_dialog_from_database(dialog_id, r_value.move_as_ok(), source);
LOG_CHECK(d == nullptr || d->dialog_id == dialog_id) << d->dialog_id << " " << dialog_id; LOG_CHECK(d == nullptr || d->dialog_id == dialog_id) << d->dialog_id << ' ' << dialog_id;
return d; return d;
} else { } else {
LOG(INFO) << "Failed to load " << dialog_id << " from database from " << source << ": " LOG(INFO) << "Failed to load " << dialog_id << " from database from " << source << ": "