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

Fix AppConfig parsing.

Browse Source
This commit is contained in:
levlam 2023-02-21 13:34:36 +03:00
parent 4b7a3dc649
commit 947a3031f3
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/Application.cpp
View File

@ -122,6 +122,10 @@ class SaveAppLogLogEvent {
auto buffer = parser.template fetch_string_raw<BufferSlice>(parser.get_left_len()); auto buffer = parser.template fetch_string_raw<BufferSlice>(parser.get_left_len());
TlBufferParser buffer_parser{&buffer}; TlBufferParser buffer_parser{&buffer};
input_app_event_out_ = telegram_api::inputAppEvent::fetch(buffer_parser); input_app_event_out_ = telegram_api::inputAppEvent::fetch(buffer_parser);
buffer_parser.fetch_end();
if (buffer_parser.get_error() != nullptr) {
return parser.set_error(buffer_parser.get_error());
}
} }
}; };

13
td/telegram/ConfigManager.cpp
View File

@ -915,19 +915,24 @@ template <class ParserT>
void ConfigManager::AppConfig::parse(ParserT &parser) { void ConfigManager::AppConfig::parse(ParserT &parser) {
td::parse(version_, parser); td::parse(version_, parser);
if (version_ != CURRENT_VERSION) { if (version_ != CURRENT_VERSION) {
version_ = 0;
return parser.set_error("Invalid config version"); return parser.set_error("Invalid config version");
} }
td::parse(hash_, parser); td::parse(hash_, parser);
auto buffer = parser.template fetch_string_raw<BufferSlice>(parser.get_left_len()); auto buffer = parser.template fetch_string_raw<BufferSlice>(parser.get_left_len());
TlBufferParser buffer_parser{&buffer}; TlBufferParser buffer_parser{&buffer};
config_ = telegram_api::JSONValue::fetch(buffer_parser); config_ = telegram_api::jsonObject::fetch(buffer_parser);
buffer_parser.fetch_end();
if (buffer_parser.get_error() != nullptr) {
return parser.set_error(buffer_parser.get_error());
}
} }
ConfigManager::ConfigManager(ActorShared<> parent) : parent_(std::move(parent)) { ConfigManager::ConfigManager(ActorShared<> parent) : parent_(std::move(parent)) {
lazy_request_flood_control_.add_limit(20, 1); lazy_request_flood_control_.add_limit(20, 1);
log_event_parse(app_config_, G()->td_db()->get_binlog_pmc()->get("app_config")).ignore(); if (log_event_parse(app_config_, G()->td_db()->get_binlog_pmc()->get("app_config")).is_error()) {
app_config_ = AppConfig();
}
} }
void ConfigManager::start_up() { void ConfigManager::start_up() {
@ -1294,6 +1299,7 @@ void ConfigManager::on_result(NetQueryPtr res) {
fail_promises(unit_promises, Status::Error(500, "Receive unexpected response")); fail_promises(unit_promises, Status::Error(500, "Receive unexpected response"));
return; return;
} }
CHECK(app_config_.config_ != nullptr);
} else { } else {
CHECK(app_config_ptr->get_id() == telegram_api::help_appConfig::ID); CHECK(app_config_ptr->get_id() == telegram_api::help_appConfig::ID);
auto app_config = telegram_api::move_object_as<telegram_api::help_appConfig>(app_config_ptr); auto app_config = telegram_api::move_object_as<telegram_api::help_appConfig>(app_config_ptr);
@ -1301,6 +1307,7 @@ void ConfigManager::on_result(NetQueryPtr res) {
app_config_.version_ = AppConfig::CURRENT_VERSION; app_config_.version_ = AppConfig::CURRENT_VERSION;
app_config_.hash_ = app_config->hash_; app_config_.hash_ = app_config->hash_;
app_config_.config_ = std::move(app_config->config_); app_config_.config_ = std::move(app_config->config_);
CHECK(app_config_.config_ != nullptr);
G()->td_db()->get_binlog_pmc()->set("app_config", log_event_store(app_config_).as_slice().str()); G()->td_db()->get_binlog_pmc()->set("app_config", log_event_store(app_config_).as_slice().str());
} }
for (auto &promise : promises) { for (auto &promise : promises) {