Merge branch 'seg_bad_mask' of https://github.com/sbentov/pysubnettree

* 'seg_bad_mask' of https://github.com/sbentov/pysubnettree: only allow max mask of 32 for AF_INET And added a similar check for masks greater than 128 for IPv6
zeek · Mar 22, 2019 · aa68223 · aa68223
2 parents 7655b36 + c649f59
commit aa68223
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,12 @@
 
+0.28-11 | 2019-03-22 16:15:24 -0700
+
+  * Improve parsing/handling of invalid subnet strings (Shai Bentov)
+
+  * GH-12: fix segfault on invalid prefixes (Jon Siwek, Corelight)
+
+  * Fix python3 compatibility of ./configure script (Jon Siwek, Corelight)
+
 0.28-2 | 2018-12-07 16:30:21 -0600
 
   * Update github/download link (Jon Siwek, Corelight)

diff --git a/README b/README
@@ -1,7 +1,7 @@
 ..	-*- mode: rst-mode -*-
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 0.28-2
+.. |version| replace:: 0.28-11
 
 ===============================================
 PySubnetTree - A Python Module for CIDR Lookups

diff --git a/SubnetTree.cc b/SubnetTree.cc
@@ -85,6 +85,11 @@ inline static bool parse_cidr(const char *cidr, int *family, inx_addr *subnet, u
 
         if ( endptr == mask_str || errno != 0 )
             return false;
+
+        if ( *family == AF_INET && *mask > 32 )
+            return false;
+        else if ( *mask > 128 )
+            return false;
     }
     else {
         if ( *family == AF_INET )

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.28-2
+0.28-11
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@
     long_description = file.read()
 
 setup(name="pysubnettree",
-    version="0.28-2", # Filled in automatically.
+    version="0.28-11", # Filled in automatically.
     maintainer="The Bro Project",
     maintainer_email="info@bro.org",
     license="BSD",

diff --git a/testing/pysubnettree/prefixes.test b/testing/pysubnettree/prefixes.test
@@ -33,3 +33,8 @@ expected = set(['2620:4d:4004:3::2/64', '10.1.0.0/16', '10.1.42.0/24', '1:2:3:4:
 p = t.prefixes(ipv4_native=True) - expected
 testcase(not p, "prefixes should include IPv4 native with len")
 
+try:
+	# Expect an exception when giving an invalid prefix
+	t.insert('8.8.8.8/56')
+except ValueError:
+	pass