andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Fix null @extra in JSON interface.

Browse Source 
GitOrigin-RevId: 1a470608d7cfbf58b55952eb3162e54d7ec245b7
This commit is contained in:
levlam 2018-05-20 16:16:16 +03:00
parent 004e562d0f
commit 407a8442f8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/ClientJson.cpp
View File

@ -24,12 +24,11 @@ Result<Client::Request> ClientJson::to_request(Slice request) {
if (json_value.type() != JsonValue::Type::Object) { if (json_value.type() != JsonValue::Type::Object) {
return Status::Error("Expected an Object"); return Status::Error("Expected an Object");
} }
TRY_RESULT(extra_field, get_json_object_field(json_value.get_object(), "@extra", JsonValue::Type::Null, true));
std::uint64_t extra_id = extra_id_.fetch_add(1, std::memory_order_relaxed); std::uint64_t extra_id = extra_id_.fetch_add(1, std::memory_order_relaxed);
auto extra_str = json_encode<string>(extra_field); if (has_json_object_field(json_value.get_object(), "@extra")) {
if (!extra_str.empty()) {
std::lock_guard<std::mutex> guard(mutex_); std::lock_guard<std::mutex> guard(mutex_);
extra_[extra_id] = std::move(extra_str); extra_[extra_id] = json_encode<string>(
get_json_object_field(json_value.get_object(), "@extra", JsonValue::Type::Null).move_as_ok());
} }
td_api::object_ptr<td_api::Function> func; td_api::object_ptr<td_api::Function> func;