Skip to content

Commit 397ed90

Browse files
committed
fix: Assure ReadlineBufRead::readline_str() calls our implementation for Box<T: ReadlineBufRead> as well.
This fixes a bug where the HTTP implementation would incorrectly concatenate packetlines without newlines as sent by the server for shallow info lines.
1 parent bfd8c04 commit 397ed90

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

gix-transport/src/client/async_io/bufread_ext.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl<T: AsyncRead + Unpin> ReadlineBufRead for gix_packetline::read::WithSideban
9494
self.read_data_line().await
9595
}
9696
async fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
97-
self.read_line(line).await
97+
self.read_line_to_string(line).await
9898
}
9999
}
100100

@@ -104,7 +104,7 @@ impl<'a, T: AsyncRead + Unpin> ReadlineBufRead for gix_packetline::read::WithSid
104104
self.read_data_line().await
105105
}
106106
async fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
107-
self.read_line(line).await
107+
self.read_line_to_string(line).await
108108
}
109109
}
110110

gix-transport/src/client/blocking_io/bufread_ext.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::io::BufRead;
21
use std::{
32
io,
43
ops::{Deref, DerefMut},
@@ -58,7 +57,7 @@ impl<'a, T: ReadlineBufRead + ?Sized + 'a> ReadlineBufRead for Box<T> {
5857
ReadlineBufRead::readline(self.deref_mut())
5958
}
6059
fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
61-
self.read_line(line)
60+
ReadlineBufRead::readline_str(self.deref_mut(), line)
6261
}
6362
}
6463

@@ -86,7 +85,7 @@ impl<T: io::Read> ReadlineBufRead for gix_packetline::read::WithSidebands<'_, T,
8685
}
8786

8887
fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
89-
self.read_line(line)
88+
self.read_line_to_string(line)
9089
}
9190
}
9291

@@ -96,7 +95,7 @@ impl<'a, T: io::Read> ReadlineBufRead for gix_packetline::read::WithSidebands<'a
9695
}
9796

9897
fn readline_str(&mut self, line: &mut String) -> io::Result<usize> {
99-
self.read_line(line)
98+
self.read_line_to_string(line)
10099
}
101100
}
102101

0 commit comments

Comments
 (0)