Ignore exceptions when deserializing note plaintexts

src/zcash/Note.cpp

@@ -173,6 +173,7 @@ boost::optional<SaplingOutgoingPlaintext> SaplingOutgoingPlaintext::decrypt(
     }
 
     // Deserialize from the plaintext
+    try {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << pt.get();
 
@@ -182,6 +183,11 @@ boost::optional<SaplingOutgoingPlaintext> SaplingOutgoingPlaintext::decrypt(
         assert(ss.size() == 0);
 
         return ret;
+    } catch (const boost::thread_interrupted&) {
+        throw;
+    } catch (...) {
+        return boost::none;
+    }
 }
 
 boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
@@ -197,13 +203,17 @@ boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
     }
 
     // Deserialize from the plaintext
+    SaplingNotePlaintext ret;
+    try {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << pt.get();
-
-    SaplingNotePlaintext ret;
         ss >> ret;
-
         assert(ss.size() == 0);
+    } catch (const boost::thread_interrupted&) {
+        throw;
+    } catch (...) {
+        return boost::none;
+    }
 
     uint256 pk_d;
     if (!librustzcash_ivk_to_pkd(ivk.begin(), ret.d.data(), pk_d.begin())) {
@@ -243,11 +253,17 @@ boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
     }
 
     // Deserialize from the plaintext
+    SaplingNotePlaintext ret;
+    try {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << pt.get();
-
-    SaplingNotePlaintext ret;
         ss >> ret;
+        assert(ss.size() == 0);
+    } catch (const boost::thread_interrupted&) {
+        throw;
+    } catch (...) {
+        return boost::none;
+    }
 
     uint256 cmu_expected;
     if (!librustzcash_sapling_compute_cm(
@@ -265,8 +281,6 @@ boost::optional<SaplingNotePlaintext> SaplingNotePlaintext::decrypt(
         return boost::none;
     }
 
-    assert(ss.size() == 0);
-
     return ret;
 }