fix: don't unwrap when reading possibly left-over bytes from pack-str…

…eam (#1352)
GitoxideLabs · Apr 30, 2024 · 88a6a4e · 88a6a4e
1 parent 28a7afc
commit 88a6a4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/gix/src/remote/connection/fetch/error.rs b/gix/src/remote/connection/fetch/error.rs
@@ -45,6 +45,8 @@ pub enum Error {
     RejectShallowRemote,
     #[error(transparent)]
     NegotiationAlgorithmConfig(#[from] config::key::GenericErrorWithValue),
+    #[error("Failed to read remaining bytes in stream")]
+    ReadRemainingBytes(#[source] std::io::Error),
 }
 
 impl gix_protocol::transport::IsSpuriousError for Error {

diff --git a/gix/src/remote/connection/fetch/receive_pack.rs b/gix/src/remote/connection/fetch/receive_pack.rs
@@ -287,7 +287,7 @@ where
                     #[cfg(not(feature = "async-network-client"))]
                     let has_read_to_end = { rd.stopped_at().is_some() };
                     if !has_read_to_end {
-                        std::io::copy(&mut rd, &mut std::io::sink()).unwrap();
+                        std::io::copy(&mut rd, &mut std::io::sink()).map_err(Error::ReadRemainingBytes)?;
                     }
                     #[cfg(feature = "async-network-client")]
                     {