From 4d9268c302e029a87cfdf01f5d139692e7f63182 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 29 Nov 2021 22:13:06 +0300
Subject: [PATCH] Early check for dialog_id correctness.

---
 td/telegram/MessagesManager.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 71dcfe660..5781a3da3 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -35830,7 +35830,9 @@ MessagesManager::Dialog *MessagesManager::get_dialog_force(DialogId dialog_id, c
 
   auto it = dialogs_.find(dialog_id);
   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) {
@@ -35841,7 +35843,7 @@ MessagesManager::Dialog *MessagesManager::get_dialog_force(DialogId dialog_id, c
   if (r_value.is_ok()) {
     LOG(INFO) << "Loaded " << dialog_id << " from database from " << 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;
   } else {
     LOG(INFO) << "Failed to load " << dialog_id << " from database from " << source << ": "