be more explicit about error handling in the ReqSocket recv() method.

zeromq · Dec 30, 2024 · ebf9403 · ebf9403
1 parent 08777a9
commit ebf9403
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/req.rs b/src/req.rs
@@ -78,14 +78,20 @@ impl SocketRecv for ReqSocket {
         match self.current_request.take() {
             Some(peer_id) => {
                 if let Some(mut peer) = self.backend.peers.get_mut(&peer_id) {
-                    let message = peer.recv_queue.next().await;
-                    match message {
+                    match peer.recv_queue.next().await {
                         Some(Ok(Message::Message(mut m))) => {
-                            assert!(m.len() > 1);
-                            assert!(m.pop_front().unwrap().is_empty()); // Ensure that we have delimeter as first part
+                            if m.len() < 2 {
+                                return Err(ZmqError::Other("Invalid message format: too few frames"));
+                            }
+                            if !m.pop_front().unwrap().is_empty() {
+                                return Err(ZmqError::Other("Invalid message format: missing delimiter"));
+                            }
                             Ok(m)
                         }
-                        Some(Ok(_)) => todo!(),
+                        Some(Ok(Message::Greeting(_))) | Some(Ok(Message::Command(_))) => {
+                            // Non-message frames should be ignored by the caller
+                            Err(ZmqError::Other("Received non-message frame"))
+                        }
                         Some(Err(error)) => Err(error.into()),
                         None => Err(ZmqError::NoMessage),
                     }