Fixed decoded issue with messages less than Padding size (lemunozm#18)

Author: lemunozm

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Release 0.5.1
 - Fixed a leak memory with timer events.
 - Improved timer events accuracy.
+- Fixed decoding issue when the messages length was less than encoding padding.
 
 ## Release 0.5.0
 - Renamed: `receive_event_timeout` to `receive_timeout`.

src/encoding.rs

@@ -60,8 +60,9 @@ impl Decoder {
  self.decoded_data.extend_from_slice(&data[..pos]);
  &data[pos..]
  }
- // No decoded data into decoder, first time data arrives.
- else if data.len() >= PADDING {
+ // No decoded data into decoder.
+ else if self.decoded_data.len() + data.len() >= PADDING {
+ // Deserializing the decoded data size
  let size_pos = std::cmp::min(PADDING - self.decoded_data.len(), PADDING);
  self.decoded_data.extend_from_slice(&data[..size_pos]);
  let expected_size =
@@ -78,7 +79,7 @@ impl Decoder {
  &data[expected_size..]
  }
  }
- // No decoded data into decoder. First time data arrives. Not enough data to know about size.
+ // No decoded data into decoder. Not enough data to know about size.
  else {
  self.decoded_data.extend_from_slice(data);
  &data[data.len()..]
@@ -273,5 +274,38 @@ mod tests {
  assert_eq!(decoded_data.unwrap(), &MESSAGE);
  }
 
+ #[test]
+ // Data content:
+ // a\n -> 2 < PADDING
+ // aa\n -> 5 > PADDING
+ // aaa\n -> 9 > PADDING
+ fn decode_len_less_than_padding() {
+ let mut buffer = Vec::new();
+ let mut decoder = Decoder::new();
+
+ buffer.push('a' as u8);
+ buffer.push('\n' as u8);
+ let (decoded_data, next_data) = decoder.decode(&buffer);
+ assert!(decoded_data.is_none());
+ assert_eq!(next_data.len(), 0);
+ buffer.clear();
+
+ buffer.push('a' as u8);
+ buffer.push('a' as u8);
+ buffer.push('\n' as u8);
+ let (decoded_data, next_data) = decoder.decode(&buffer);
+ assert!(decoded_data.is_none());
+ assert_eq!(next_data.len(), 0);
+ buffer.clear();
+
+ buffer.push('a' as u8);
+ buffer.push('a' as u8);
+ buffer.push('a' as u8);
+ buffer.push('\n' as u8);
+ let (decoded_data, next_data) = decoder.decode(&buffer);
+ assert!(decoded_data.is_none());
+ assert_eq!(next_data.len(), 0);
+ }
+
  //TODO: test DecodingPool
 }