return EOF error kind when Decoder.decode read len is 0, #2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "resp"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Qing Yan <[email protected]>"]
 description = "RESP(REdis Serialization Protocol) Serialization for Rust."
 documentation = "https://docs.rs/resp"
@@ -11,4 +11,4 @@ keywords = ["redis", "resp", "serialization"]
 license = "MIT/Apache-2.0"
 
 [dev-dependencies]
-rand = "0.3"
+rand = "0.8"

LICENSE

@@ -1,5 +1,5 @@
 MIT/Apache-2.0
 
-Copyright (c) 2016-2017 IORust Developers
+Copyright (c) 2016-2022 IORust Developers
 
 See LICENSE-APACHE and LICENSE-MIT.

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2017 IORust Developers
+Copyright (c) 2016-2022 IORust Developers
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

src/serialize.rs

@@ -142,6 +142,9 @@ impl<R: Read> Decoder<R> {
         self.reader.read_until(b'\n', &mut res)?;
 
         let len = res.len();
+        if len == 0 {
+            return Err(Error::new(ErrorKind::UnexpectedEof, "unexpected EOF"));
+        }
         if len < 3 {
             return Err(Error::new(ErrorKind::InvalidInput, format!("too short: {}", len)));
         }
@@ -486,7 +489,15 @@ mod tests {
     fn struct_decoder_with_invalid_data() {
         let buf: &[u8] = &[];
         let mut decoder = Decoder::new(BufReader::new(buf));
-        assert!(decoder.decode().is_err());
+        let rt = decoder.decode();
+        assert!(rt.is_err());
+        assert_eq!(rt.unwrap_err().kind(), ErrorKind::UnexpectedEof);
+
+        let buf: &[u8] = &[1, 2];
+        let mut decoder = Decoder::new(BufReader::new(buf));
+        let rt = decoder.decode();
+        assert!(rt.is_err());
+        assert_eq!(rt.unwrap_err().kind(), ErrorKind::InvalidInput);
 
 
         let buf = Value::String("OK正".to_string()).encode();

tests/lib.rs

@@ -7,7 +7,7 @@ use std::io;
 use std::io::{Read, BufReader};
 use resp::{Value, encode, encode_slice, Decoder};
 use std::{thread, time};
-use rand::{StdRng, Rng};
+use rand::{thread_rng, Rng};
 
 struct Case {
     data: Vec<u8>,
@@ -22,11 +22,8 @@ struct FakeNetIO {
 impl Read for FakeNetIO {
     fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
         if self.offset < self.buf.len() {
-            let mut rng = StdRng::new().unwrap();
-            let mut n: usize = rng.gen_range(0, std::cmp::min(buf.len(), 1024));
-            if n == 0 {
-                n = buf.len();
-            }
+            let mut rng = thread_rng();
+            let mut n: usize = rng.gen_range(1..=std::cmp::min(buf.len(), 1024));
             if self.offset + n > self.buf.len() {
                 n = self.buf.len() - self.offset;
             }