From eabcb6a8e9847a384b2ba6ad5b03e9af5a4daf43 Mon Sep 17 00:00:00 2001
From: SpyCheese <mikle98@yandex.ru>
Date: Sun, 2 Apr 2023 14:27:31 +0000
Subject: [PATCH] Better error handling in stack serialization (#664)

---
 crypto/vm/stack.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/crypto/vm/stack.cpp b/crypto/vm/stack.cpp
index 9a17c8e2..e82b25de 100644
--- a/crypto/vm/stack.cpp
+++ b/crypto/vm/stack.cpp
@@ -908,23 +908,29 @@ bool Stack::serialize(vm::CellBuilder& cb, int mode) const {
   if (vsi && !vsi->register_op()) {
     return false;
   }
-  // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
-  unsigned n = depth();
-  if (!cb.store_ulong_rchk_bool(n, 24)) {  // vm_stack#_ depth:(## 24)
-    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))) {
+  try {
+    // vm_stack#_ depth:(## 24) stack:(VmStackList depth) = VmStack;
+    unsigned n = depth();
+    if (!cb.store_ulong_rchk_bool(n, 24)) {  // vm_stack#_ depth:(## 24)
       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) {