external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

Fix parsing dict of public libraries (#762)

Browse source
This commit is contained in:
SpyCheese 2023-08-07 19:48:33 +03:00 • committed by GitHub
parent 6074702d05
commit 6e51453056
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
validator/impl/validate-query.cpp
View file

@ -4796,27 +4796,27 @@ bool ValidateQuery::check_one_library_update(td::ConstBitPtr key, Ref<vm::CellSl
// shared_lib_descr$00 lib:^Cell publishers:(Hashmap 256 True) = LibDescr; // shared_lib_descr$00 lib:^Cell publishers:(Hashmap 256 True) = LibDescr;
std::unique_ptr<vm::Dictionary> old_publishers, new_publishers; std::unique_ptr<vm::Dictionary> old_publishers, new_publishers;
if (new_value.not_null()) { if (new_value.not_null()) {
if (!block::gen::t_LibDescr.validate_csr(new_value)) { block::gen::LibDescr::Record rec;
return reject_query("LibDescr with key "s + key.to_hex(256) + if (!block::gen::csr_unpack(std::move(new_value), rec)) {
" in the libraries dictionary of the new state failed to pass automatic validity tests"); return reject_query("failed to unpack LibDescr with key "s + key.to_hex(256) +
" in the libraries dictionary of the new state");
} }
auto lib_ref = new_value->prefetch_ref(); if (rec.lib->get_hash().as_bitslice() != key) {
CHECK(lib_ref.not_null());
if (lib_ref->get_hash().as_bitslice() != key) {
return reject_query("LibDescr with key "s + key.to_hex(256) + return reject_query("LibDescr with key "s + key.to_hex(256) +
" in the libraries dictionary of the new state contains a library with different root hash " + " in the libraries dictionary of the new state contains a library with different root hash " +
lib_ref->get_hash().to_hex()); rec.lib->get_hash().to_hex());
} }
CHECK(new_value.write().advance_ext(2, 1)); new_publishers = std::make_unique<vm::Dictionary>(vm::DictNonEmpty(), std::move(rec.publishers), 256);
new_publishers = std::make_unique<vm::Dictionary>(vm::DictNonEmpty(), std::move(new_value), 256);
} else { } else {
new_publishers = std::make_unique<vm::Dictionary>(256); new_publishers = std::make_unique<vm::Dictionary>(256);
} }
if (old_value.not_null() && !block::gen::t_LibDescr.validate_csr(old_value)) { if (old_value.not_null()) {
return reject_query("LibDescr with key "s + key.to_hex(256) + block::gen::LibDescr::Record rec;
" in the libraries dictionary of the old state failed to pass automatic validity tests"); if (!block::gen::csr_unpack(std::move(old_value), rec)) {
CHECK(old_value.write().advance_ext(2, 1)); return reject_query("failed to unpack LibDescr with key "s + key.to_hex(256) +
old_publishers = std::make_unique<vm::Dictionary>(vm::DictNonEmpty(), std::move(old_value), 256); " in the libraries dictionary of the old state");
}
old_publishers = std::make_unique<vm::Dictionary>(vm::DictNonEmpty(), std::move(rec.publishers), 256);
} else { } else {
old_publishers = std::make_unique<vm::Dictionary>(256); old_publishers = std::make_unique<vm::Dictionary>(256);
} }