From dc763d2d03b4ea518069ffa28deb1b98a830f947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20F=C3=A4rnstrand?= <faern@faern.net>
Date: Fri, 17 Jun 2016 17:25:58 +0200
Subject: [PATCH] Fix Ipv4Network::mask shift overflow bug

---
 src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 3c10a72..3a10954 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,7 +59,7 @@ impl Ipv4Network {
 
     pub fn mask(&self) -> (Ipv4Addr, u32) {
         let prefix = self.prefix;
-        let mask = !(0xffffffff >> prefix);
+        let mask = !(0xffffffff as u64 >> prefix) as u32;
         (Ipv4Addr::from(mask), mask)
     }
 
@@ -191,19 +191,26 @@ mod test {
     }
 
     #[test]
-    fn parse_v4() {
+    fn parse_v4_0bit() {
         let cidr = Ipv4Network::from_cidr("0/0").unwrap();
         assert_eq!(cidr.ip(), Ipv4Addr::new(0, 0, 0, 0));
         assert_eq!(cidr.prefix(), 0);
     }
 
     #[test]
-    fn parse_v4_2() {
+    fn parse_v4_24bit() {
         let cidr = Ipv4Network::from_cidr("127.1.0.0/24").unwrap();
         assert_eq!(cidr.ip(), Ipv4Addr::new(127, 1, 0, 0));
         assert_eq!(cidr.prefix(), 24);
     }
 
+    #[test]
+    fn parse_v4_32bit() {
+        let cidr = Ipv4Network::from_cidr("127.0.0.0/32").unwrap();
+        assert_eq!(cidr.ip(), Ipv4Addr::new(127, 0, 0, 0));
+        assert_eq!(cidr.prefix(), 32);
+    }
+
     #[test]
     fn parse_v4_fail_addr() {
         let cidr = Ipv4Network::from_cidr("10.a.b/8");