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

Check UTF-8 correctness of strings before adding them to Hints.

Browse Source
This commit is contained in:
levlam 2021-06-17 23:29:13 +03:00
parent 843df9e1f7
commit ed7a7e5eaf
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
td/telegram/ContactsManager.cpp
View File

@ -3849,6 +3849,22 @@ void ContactsManager::User::parse(ParserT &parser) {
parse(cache_version, parser);
}
if (!check_utf8(first_name)) {
LOG(ERROR) << "Have invalid first name \"" << first_name << '"';
first_name.clear();
cache_version = 0;
}
if (!check_utf8(last_name)) {
LOG(ERROR) << "Have invalid last name \"" << last_name << '"';
last_name.clear();
cache_version = 0;
}
if (!check_utf8(username)) {
LOG(ERROR) << "Have invalid username \"" << username << '"';
username.clear();
cache_version = 0;
}
if (first_name.empty() && last_name.empty()) {
first_name = phone_number;
}
@ -4022,6 +4038,12 @@ void ContactsManager::Chat::parse(ParserT &parser) {
parse(cache_version, parser);
}
if (!check_utf8(title)) {
LOG(ERROR) << "Have invalid title \"" << title << '"';
title.clear();
cache_version = 0;
}
if (status.is_administrator() && !status.is_creator()) {
status = DialogParticipantStatus::GroupAdministrator(false);
}
@ -4239,6 +4261,17 @@ void ContactsManager::Channel::parse(ParserT &parser) {
if (has_cache_version) {
parse(cache_version, parser);
}
if (!check_utf8(title)) {
LOG(ERROR) << "Have invalid title \"" << title << '"';
title.clear();
cache_version = 0;
}
if (!check_utf8(username)) {
LOG(ERROR) << "Have invalid username \"" << username << '"';
username.clear();
cache_version = 0;
}
if (legacy_has_active_group_call) {
cache_version = 0;
}
@ -4914,6 +4947,7 @@ string ContactsManager::get_channel_username(ChannelId channel_id) const {
}
return c->username;
}
UserId ContactsManager::get_secret_chat_user_id(SecretChatId secret_chat_id) const {
auto c = get_secret_chat(secret_chat_id);
if (c == nullptr) {
@ -8415,19 +8449,6 @@ void ContactsManager::on_load_user_from_database(UserId user_id, string value) {
log_event_parse(*u, value).ensure();
if (!check_utf8(u->first_name)) {
LOG(ERROR) << "Have invalid " << user_id << " first name \"" << u->first_name << '"';
u->first_name.clear();
}
if (!check_utf8(u->last_name)) {
LOG(ERROR) << "Have invalid " << user_id << " last name \"" << u->last_name << '"';
u->last_name.clear();
}
if (!check_utf8(u->username)) {
LOG(ERROR) << "Have invalid " << user_id << " username \"" << u->username << '"';
u->username.clear();
}
u->is_saved = true;
u->is_status_saved = true;
update_user(u, user_id, true, true);

8
td/telegram/StickersManager.hpp
View File

@ -16,6 +16,7 @@
#include "td/utils/misc.h"
#include "td/utils/Slice.h"
#include "td/utils/tl_helpers.h"
#include "td/utils/utf8.h"
namespace td {
@ -317,6 +318,13 @@ void StickersManager::parse_sticker_set(StickerSet *sticker_set, ParserT &parser
if (expires_at > sticker_set->expires_at) {
sticker_set->expires_at = expires_at;
}
if (!check_utf8(sticker_set->title)) {
return parser.set_error("Have invalid sticker set title");
}
if (!check_utf8(sticker_set->short_name)) {
return parser.set_error("Have invalid sticker set name");
}
}
}