Fix bug in BufReader::fill_buf when reaching EOF

TheBlueMatt · TheBlueMatt · commit aadf233d6c29 · 2024-08-19T14:55:28.000Z
When we reach EOF we may return a full buffer when we should return
an empty one.
diff --git a/lightning/src/util/ser.rs b/lightning/src/util/ser.rs
@@ -111,7 +111,11 @@ impl<'a, R: Read> BufRead for BufReader<'a, R> {
 			self.is_consumed = count == 0;
 		}
 
-		Ok(&self.buf[..])
+		if self.is_consumed {
+			Ok(&[])
+		} else {
+			Ok(&self.buf[..])
+		}
 	}
 
 	#[inline]

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,11 @@ impl<'a, R: Read> BufRead for BufReader<'a, R> {`
`111`	`111`	`self.is_consumed = count == 0;`
`112`	`112`	`}`
`113`	`113`
`114`		`- Ok(&self.buf[..])`
	`114`	`+ if self.is_consumed {`
	`115`	`+ Ok(&[])`
	`116`	`+ } else {`
	`117`	`+ Ok(&self.buf[..])`
	`118`	`+ }`
`115`	`119`	`}`
`116`	`120`
`117`	`121`	`#[inline]`