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

Better error handling in stack serialization (#664)

Browse source
This commit is contained in:
SpyCheese 2023-04-02 14:27:31 +00:00 • committed by GitHub
parent 3a30d6f319
commit eabcb6a8e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crypto/vm/stack.cpp
View file

@ -908,23 +908,29 @@ bool Stack::serialize(vm::CellBuilder& cb, int mode) const {
if (vsi && !vsi->register_op()) { if (vsi && !vsi->register_op()) {
return false; return false;
} }
// vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack; try {
unsigned n = depth(); // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
if (!cb.store_ulong_rchk_bool(n, 24)) { // vm_stack#_ depth:(## 24) unsigned n = depth();
return false; if (!cb.store_ulong_rchk_bool(n, 24)) { // vm_stack#_ depth:(## 24)
}
if (!n) {
return true;
}
vm::CellBuilder cb2;
Ref<vm::Cell> rest = cb2.finalize(); // vm_stk_nil#_ = VmStackList 0;
for (unsigned i = 0; i < n - 1; i++) {
// vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
if (!(cb2.store_ref_bool(std::move(rest)) && stack[i].serialize(cb2, mode) && cb2.finalize_to(rest))) {
return false; return false;
} }
if (!n) {
return true;
}
vm::CellBuilder cb2;
Ref<vm::Cell> rest = cb2.finalize(); // vm_stk_nil#_ = VmStackList 0;
for (unsigned i = 0; i < n - 1; i++) {
// vm_stk_cons#_ {n:#} rest:^(VmStackList n) tos:VmStackValue = VmStackList (n + 1);
if (!(cb2.store_ref_bool(std::move(rest)) && stack[i].serialize(cb2, mode) && cb2.finalize_to(rest))) {
return false;
}
}
return cb.store_ref_bool(std::move(rest)) && stack[n - 1].serialize(cb, mode);
} catch (CellBuilder::CellCreateError) {
return false;
} catch (CellBuilder::CellWriteError) {
return false;
} }
return cb.store_ref_bool(std::move(rest)) && stack[n - 1].serialize(cb, mode);
} }
bool Stack::deserialize(vm::CellSlice& cs, int mode) { bool Stack::deserialize(vm::CellSlice& cs, int mode) {