From af2262cbba0ee62040e0637f2d1c23489d497356 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Mon, 14 Sep 2020 17:19:28 -0600
Subject: [PATCH] Faucet: Improve error handling

---
 faucet/src/faucet.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/faucet/src/faucet.rs b/faucet/src/faucet.rs
index f8187bc8a5..a7d6d0fd39 100644
--- a/faucet/src/faucet.rs
+++ b/faucet/src/faucet.rs
@@ -211,7 +211,7 @@ pub fn request_airdrop_transaction(
 
     // Read length of transaction
     let mut buffer = [0; 2];
-    stream.read_exact(&mut buffer).map(|err| {
+    stream.read_exact(&mut buffer).map_err(|err| {
         info!(
             "request_airdrop_transaction: buffer length read_exact error: {:?}",
             err
@@ -219,7 +219,7 @@ pub fn request_airdrop_transaction(
         Error::new(ErrorKind::Other, "Airdrop failed")
     })?;
     let transaction_length = LittleEndian::read_u16(&buffer) as usize;
-    if transaction_length >= PACKET_DATA_SIZE {
+    if transaction_length >= PACKET_DATA_SIZE || transaction_length == 0 {
         return Err(Error::new(
             ErrorKind::Other,
             format!(
@@ -293,7 +293,7 @@ pub fn run_faucet(
                     }
                     Err(e) => {
                         info!("Error in request: {:?}", e);
-                        Ok(Bytes::from(&b""[..]))
+                        Ok(Bytes::from(0u16.to_le_bytes().to_vec()))
                     }
                 }
             });