From edf6b00f1376817da28899eb08e72f2d00fba95a Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Tue, 16 May 2023 14:40:33 +0800
Subject: [PATCH] remove all assert in non-test code

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 libs/hbb_common/src/tcp.rs     | 4 +++-
 src/flutter.rs                 | 6 +++---
 src/plugin/mod.rs              | 2 +-
 src/server/portable_service.rs | 2 +-
 src/server/service.rs          | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
index 2285e6430..296ad5701 100644
--- a/libs/hbb_common/src/tcp.rs
+++ b/libs/hbb_common/src/tcp.rs
@@ -349,7 +349,9 @@ impl Encrypt {
         their_pk_b: &[u8],
         our_sk_b: &box_::SecretKey,
     ) -> ResultType<Key> {
-        assert!(their_pk_b.len() == box_::PUBLICKEYBYTES);
+        if their_pk_b.len() != box_::PUBLICKEYBYTES {
+            anyhow::bail!("Handshake failed: pk length {}", their_pk_b.len());
+        }
         let nonce = box_::Nonce([0u8; box_::NONCEBYTES]);
         let mut pk_ = [0u8; box_::PUBLICKEYBYTES];
         pk_[..].copy_from_slice(their_pk_b);
diff --git a/src/flutter.rs b/src/flutter.rs
index db7d466ef..f6461b744 100644
--- a/src/flutter.rs
+++ b/src/flutter.rs
@@ -108,7 +108,7 @@ fn rust_args_to_c_args(args: Vec<String>, outlen: *mut c_int) -> *mut *mut c_cha
 
     // Make sure we're not wasting space.
     out.shrink_to_fit();
-    assert!(out.len() == out.capacity());
+    debug_assert!(out.len() == out.capacity());
 
     // Get the pointer to our vector.
     let len = out.len();
@@ -257,7 +257,7 @@ impl FlutterHandler {
     /// * `event` - Fields of the event content.
     pub fn push_event(&self, name: &str, event: Vec<(&str, &str)>) -> Option<bool> {
         let mut h: HashMap<&str, &str> = event.iter().cloned().collect();
-        assert!(h.get("name").is_none());
+        debug_assert!(h.get("name").is_none());
         h.insert("name", name);
         let out = serde_json::ser::to_string(&h).unwrap_or("".to_owned());
         Some(
@@ -858,7 +858,7 @@ pub mod connection_manager {
     impl FlutterHandler {
         fn push_event(&self, name: &str, event: Vec<(&str, &str)>) {
             let mut h: HashMap<&str, &str> = event.iter().cloned().collect();
-            assert!(h.get("name").is_none());
+            debug_assert!(h.get("name").is_none());
             h.insert("name", name);
 
             if let Some(s) = GLOBAL_EVENT_STREAM.read().unwrap().get(super::APP_TYPE_CM) {
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
index 19fc11979..4aef79648 100644
--- a/src/plugin/mod.rs
+++ b/src/plugin/mod.rs
@@ -79,7 +79,7 @@ impl PluginReturn {
         if self.is_success() {
             (self.code, "".to_owned())
         } else {
-            assert!(!self.msg.is_null());
+            debug_assert!(!self.msg.is_null(), "msg is null");
             let msg = cstr_to_string(self.msg).unwrap_or_default();
             free_c_ptr(self.msg as _);
             self.msg = null();
diff --git a/src/server/portable_service.rs b/src/server/portable_service.rs
index 508ddca5c..b794e9823 100644
--- a/src/server/portable_service.rs
+++ b/src/server/portable_service.rs
@@ -109,7 +109,7 @@ impl SharedMemory {
 
     pub fn write(&self, addr: usize, data: &[u8]) {
         unsafe {
-            assert!(addr + data.len() <= self.inner.len());
+            debug_assert!(addr + data.len() <= self.inner.len());
             let ptr = self.inner.as_ptr().add(addr);
             let shared_mem_slice = slice::from_raw_parts_mut(ptr, data.len());
             shared_mem_slice.copy_from_slice(data);
diff --git a/src/server/service.rs b/src/server/service.rs
index fe038f3c0..1cbed5acc 100644
--- a/src/server/service.rs
+++ b/src/server/service.rs
@@ -49,7 +49,7 @@ impl<T: Subscriber + From<ConnInner>> ServiceInner<T> {
         for (_, s) in self.new_subscribes.drain() {
             self.subscribes.insert(s.id(), s);
         }
-        assert!(self.new_subscribes.is_empty());
+        debug_assert!(self.new_subscribes.is_empty());
     }
 
     #[inline]