From cd4dddb2485b140cd8b77b09c8d0137061434c0a Mon Sep 17 00:00:00 2001
From: Michael Sproul <michael@sigmaprime.io>
Date: Mon, 5 Aug 2019 17:26:02 +1000
Subject: [PATCH] Fix Bitfield from_bytes empty vec bug

Credit to @kirk-baird for finding the bug with the fuzzer.

Co-authored-by: Kirk Baird <baird.k@outlook.com>
---
 eth2/utils/ssz_types/src/bitfield.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eth2/utils/ssz_types/src/bitfield.rs b/eth2/utils/ssz_types/src/bitfield.rs
index 78182712b92..592574e15ae 100644
--- a/eth2/utils/ssz_types/src/bitfield.rs
+++ b/eth2/utils/ssz_types/src/bitfield.rs
@@ -163,8 +163,7 @@ impl<N: Unsigned + Clone> Bitfield<Variable<N>> {
     pub fn from_bytes(bytes: Vec<u8>) -> Result<Self, Error> {
         let mut initial_bitfield: Bitfield<Variable<N>> = {
             let num_bits = bytes.len() * 8;
-            Bitfield::from_raw_bytes(bytes, num_bits)
-                .expect("Must have adequate bytes for bit count.")
+            Bitfield::from_raw_bytes(bytes, num_bits)?
         };
 
         let len = initial_bitfield
@@ -802,6 +801,11 @@ mod bitlist {
 
     #[test]
     fn ssz_decode() {
+        assert!(BitList0::from_ssz_bytes(&[]).is_err());
+        assert!(BitList1::from_ssz_bytes(&[]).is_err());
+        assert!(BitList8::from_ssz_bytes(&[]).is_err());
+        assert!(BitList16::from_ssz_bytes(&[]).is_err());
+
         assert!(BitList0::from_ssz_bytes(&[0b0000_0000]).is_err());
         assert!(BitList1::from_ssz_bytes(&[0b0000_0000, 0b0000_0000]).is_err());
         assert!(BitList8::from_ssz_bytes(&[0b0000_0000]).is_err());