From 0c1ba485f46601dd16cbd129a4b2558eee61c429 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 9 Sep 2019 00:32:28 +0200
Subject: [PATCH] merge

---
 src/main.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index dab3022..6fe6c44 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -113,9 +113,11 @@ async fn handle_client_query(
     loop {
         response = vec![0u8; DNS_MAX_PACKET_SIZE];
         let response_len = ext_socket.recv(&mut response[..]).await?;
-        ensure!(response_len > DNS_HEADER_SIZE, "Short packet");
         response.truncate(response_len);
-        if dns::tid(&response) == tid && dns::qname(&packet)? == dns::qname(&response)? {
+        if response_len >= DNS_HEADER_SIZE
+            && dns::tid(&response) == tid
+            && dns::qname(&packet)? == dns::qname(&response)?
+        {
             break;
         }
         dbg!("Response collision");