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

Fix null checks crash

Browse Source
This commit is contained in:
Andrea Cavalli 2021-01-12 02:40:01 +01:00
parent 716104845d
commit b6f0df26bc
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
td/telegram/BackgroundManager.cpp
View File

@ -665,7 +665,7 @@ void BackgroundManager::save_background_id(bool for_dark_theme) const {
auto background_id = set_background_id_[for_dark_theme]; auto background_id = set_background_id_[for_dark_theme];
if (background_id.is_valid()) { if (background_id.is_valid()) {
const Background *background = get_background(background_id); const Background *background = get_background(background_id);
CHECK(background != nullptr); if (!(background != nullptr)) return;
BackgroundLogEvent log_event{*background, set_background_type_[for_dark_theme]}; BackgroundLogEvent log_event{*background, set_background_type_[for_dark_theme]};
G()->td_db()->get_binlog_pmc()->set(key, log_event_store(log_event).as_slice().str()); G()->td_db()->get_binlog_pmc()->set(key, log_event_store(log_event).as_slice().str());
} else { } else {
@ -754,7 +754,7 @@ void BackgroundManager::do_upload_background_file(FileId file_id, const Backgrou
void BackgroundManager::on_uploaded_background_file(FileId file_id, const BackgroundType &type, bool for_dark_theme, void BackgroundManager::on_uploaded_background_file(FileId file_id, const BackgroundType &type, bool for_dark_theme,
telegram_api::object_ptr<telegram_api::WallPaper> wallpaper, telegram_api::object_ptr<telegram_api::WallPaper> wallpaper,
Promise<Unit> &&promise) { Promise<Unit> &&promise) {
CHECK(wallpaper != nullptr); if (!(wallpaper != nullptr)) promise.set_error(Status::Error(500, "Error"));
BackgroundId background_id = on_get_background(BackgroundId(), string(), std::move(wallpaper)); BackgroundId background_id = on_get_background(BackgroundId(), string(), std::move(wallpaper));
if (!background_id.is_valid()) { if (!background_id.is_valid()) {
@ -763,7 +763,7 @@ void BackgroundManager::on_uploaded_background_file(FileId file_id, const Backgr
} }
auto background = get_background(background_id); auto background = get_background(background_id);
CHECK(background != nullptr); if (!(background != nullptr)) return promise.set_error(Status::Error(500, "Error"));
if (!background->file_id.is_valid()) { if (!background->file_id.is_valid()) {
td_->file_manager_->cancel_upload(file_id); td_->file_manager_->cancel_upload(file_id);
return promise.set_error(Status::Error(500, "Receive wrong uploaded background without file")); return promise.set_error(Status::Error(500, "Receive wrong uploaded background without file"));
@ -927,7 +927,7 @@ string BackgroundManager::get_background_name_database_key(const string &name) {
BackgroundId BackgroundManager::on_get_background(BackgroundId expected_background_id, BackgroundId BackgroundManager::on_get_background(BackgroundId expected_background_id,
const string &expected_background_name, const string &expected_background_name,
telegram_api::object_ptr<telegram_api::WallPaper> wallpaper_ptr) { telegram_api::object_ptr<telegram_api::WallPaper> wallpaper_ptr) {
CHECK(wallpaper_ptr != nullptr); if (!(wallpaper_ptr != nullptr)) return BackgroundId();
if (wallpaper_ptr->get_id() == telegram_api::wallPaperNoFile::ID) { if (wallpaper_ptr->get_id() == telegram_api::wallPaperNoFile::ID) {
auto wallpaper = move_tl_object_as<telegram_api::wallPaperNoFile>(wallpaper_ptr); auto wallpaper = move_tl_object_as<telegram_api::wallPaperNoFile>(wallpaper_ptr);

27
td/telegram/PollManager.cpp
View File

@ -337,7 +337,7 @@ void PollManager::save_poll(const Poll *poll, PollId poll_id) {
} }
LOG(INFO) << "Save " << poll_id << " to database"; LOG(INFO) << "Save " << poll_id << " to database";
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
G()->td_db()->get_sqlite_pmc()->set(get_poll_database_key(poll_id), log_event_store(*poll).as_slice().str(), Auto()); G()->td_db()->get_sqlite_pmc()->set(get_poll_database_key(poll_id), log_event_store(*poll).as_slice().str(), Auto());
} }
@ -625,7 +625,7 @@ void PollManager::register_poll(PollId poll_id, FullMessageId full_message_id, c
bool is_inserted = poll_messages_[poll_id].insert(full_message_id).second; bool is_inserted = poll_messages_[poll_id].insert(full_message_id).second;
LOG_CHECK(is_inserted) << source << " " << poll_id << " " << full_message_id; LOG_CHECK(is_inserted) << source << " " << poll_id << " " << full_message_id;
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (!td_->auth_manager_->is_bot() && !is_local_poll_id(poll_id) && if (!td_->auth_manager_->is_bot() && !is_local_poll_id(poll_id) &&
!(poll->is_closed && poll->is_updated_after_close)) { !(poll->is_closed && poll->is_updated_after_close)) {
update_poll_timeout_.add_timeout_in(poll_id.get(), 0); update_poll_timeout_.add_timeout_in(poll_id.get(), 0);
@ -683,7 +683,7 @@ void PollManager::set_poll_answer(PollId poll_id, FullMessageId full_message_id,
} }
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return promise.set_error(Status::Error(400, "Poll can't be answered"));
if (poll->is_closed) { if (poll->is_closed) {
return promise.set_error(Status::Error(400, "Can't answer closed poll")); return promise.set_error(Status::Error(400, "Can't answer closed poll"));
} }
@ -932,7 +932,7 @@ void PollManager::get_poll_voters(PollId poll_id, FullMessageId full_message_id,
} }
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return promise.set_error(Status::Error(400, "Poll results can't be received"));
if (option_id < 0 || static_cast<size_t>(option_id) >= poll->options.size()) { if (option_id < 0 || static_cast<size_t>(option_id) >= poll->options.size()) {
return promise.set_error(Status::Error(400, "Invalid option ID specified")); return promise.set_error(Status::Error(400, "Invalid option ID specified"));
} }
@ -982,7 +982,7 @@ void PollManager::get_poll_voters(PollId poll_id, FullMessageId full_message_id,
void PollManager::on_get_poll_voters(PollId poll_id, int32 option_id, string offset, int32 limit, void PollManager::on_get_poll_voters(PollId poll_id, int32 option_id, string offset, int32 limit,
Result<tl_object_ptr<telegram_api::messages_votesList>> &&result) { Result<tl_object_ptr<telegram_api::messages_votesList>> &&result) {
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (option_id < 0 || static_cast<size_t>(option_id) >= poll->options.size()) { if (option_id < 0 || static_cast<size_t>(option_id) >= poll->options.size()) {
LOG(ERROR) << "Can't process voters for option " << option_id << " in " << poll_id << ", because it has only " LOG(ERROR) << "Can't process voters for option " << option_id << " in " << poll_id << ", because it has only "
<< poll->options.size() << " options"; << poll->options.size() << " options";
@ -1076,7 +1076,10 @@ void PollManager::stop_poll(PollId poll_id, FullMessageId full_message_id, uniqu
return; return;
} }
auto poll = get_poll_editable(poll_id); auto poll = get_poll_editable(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) {
promise.set_value(Unit());
return;
}
if (poll->is_closed) { if (poll->is_closed) {
promise.set_value(Unit()); promise.set_value(Unit());
return; return;
@ -1129,7 +1132,7 @@ void PollManager::do_stop_poll(PollId poll_id, FullMessageId full_message_id, un
void PollManager::stop_local_poll(PollId poll_id) { void PollManager::stop_local_poll(PollId poll_id) {
CHECK(is_local_poll_id(poll_id)); CHECK(is_local_poll_id(poll_id));
auto poll = get_poll_editable(poll_id); auto poll = get_poll_editable(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (poll->is_closed) { if (poll->is_closed) {
return; return;
} }
@ -1151,7 +1154,7 @@ void PollManager::on_update_poll_timeout(PollId poll_id) {
return; return;
} }
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (poll->is_closed && poll->is_updated_after_close) { if (poll->is_closed && poll->is_updated_after_close) {
return; return;
} }
@ -1182,7 +1185,7 @@ void PollManager::on_close_poll_timeout(PollId poll_id) {
} }
auto poll = get_poll_editable(poll_id); auto poll = get_poll_editable(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (poll->is_closed || poll->close_date == 0) { if (poll->is_closed || poll->close_date == 0) {
return; return;
} }
@ -1206,7 +1209,7 @@ void PollManager::on_close_poll_timeout(PollId poll_id) {
void PollManager::on_get_poll_results(PollId poll_id, uint64 generation, void PollManager::on_get_poll_results(PollId poll_id, uint64 generation,
Result<tl_object_ptr<telegram_api::Updates>> result) { Result<tl_object_ptr<telegram_api::Updates>> result) {
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return;
if (result.is_error()) { if (result.is_error()) {
if (!(poll->is_closed && poll->is_updated_after_close) && !G()->close_flag() && !td_->auth_manager_->is_bot()) { if (!(poll->is_closed && poll->is_updated_after_close) && !G()->close_flag() && !td_->auth_manager_->is_bot()) {
auto timeout = get_polling_timeout(); auto timeout = get_polling_timeout();
@ -1246,7 +1249,7 @@ void PollManager::on_online() {
bool PollManager::has_input_media(PollId poll_id) const { bool PollManager::has_input_media(PollId poll_id) const {
auto poll = get_poll(poll_id); auto poll = get_poll(poll_id);
CHECK(poll != nullptr); if (!(poll != nullptr)) return false;
return !poll->is_quiz || poll->correct_option_id >= 0; return !poll->is_quiz || poll->correct_option_id >= 0;
} }
@ -1355,7 +1358,7 @@ PollId PollManager::on_get_poll(PollId poll_id, tl_object_ptr<telegram_api::poll
bool is_inserted = polls_.emplace(poll_id, std::move(p)).second; bool is_inserted = polls_.emplace(poll_id, std::move(p)).second;
CHECK(is_inserted); CHECK(is_inserted);
} }
CHECK(poll != nullptr); if (!(poll != nullptr)) return PollId();
bool poll_server_is_closed = false; bool poll_server_is_closed = false;
if (poll_server != nullptr) { if (poll_server != nullptr) {