Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f3fc0c1

Browse filesBrowse files
authored
gh-134062: Fix hash collisions in IPv4Network and IPv6Network (GH-134063)
gh-134062: Fix hash collisions in IPv4Network and IPv6Network gh-134062: Add hash collision regression test
1 parent 518c95b commit f3fc0c1
Copy full SHA for f3fc0c1

File tree

3 files changed

+32
-1
lines changed
Filter options

3 files changed

+32
-1
lines changed

‎Lib/ipaddress.py

Copy file name to clipboardExpand all lines: Lib/ipaddress.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ def __eq__(self, other):
729729
return NotImplemented
730730

731731
def __hash__(self):
732-
return hash(int(self.network_address) ^ int(self.netmask))
732+
return hash((int(self.network_address), int(self.netmask)))
733733

734734
def __contains__(self, other):
735735
# always false if one is v4 and the other is v6.

‎Lib/test/test_ipaddress.py

Copy file name to clipboardExpand all lines: Lib/test/test_ipaddress.py
+28Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2762,6 +2762,34 @@ def testV6HashIsNotConstant(self):
27622762
ipv6_address2 = ipaddress.IPv6Interface("2001:658:22a:cafe:200:0:0:2")
27632763
self.assertNotEqual(ipv6_address1.__hash__(), ipv6_address2.__hash__())
27642764

2765+
# issue 134062 Hash collisions in IPv4Network and IPv6Network
2766+
def testNetworkV4HashCollisions(self):
2767+
self.assertNotEqual(
2768+
ipaddress.IPv4Network("192.168.1.255/32").__hash__(),
2769+
ipaddress.IPv4Network("192.168.1.0/24").__hash__()
2770+
)
2771+
self.assertNotEqual(
2772+
ipaddress.IPv4Network("172.24.255.0/24").__hash__(),
2773+
ipaddress.IPv4Network("172.24.0.0/16").__hash__()
2774+
)
2775+
self.assertNotEqual(
2776+
ipaddress.IPv4Network("192.168.1.87/32").__hash__(),
2777+
ipaddress.IPv4Network("192.168.1.86/31").__hash__()
2778+
)
2779+
2780+
# issue 134062 Hash collisions in IPv4Network and IPv6Network
2781+
def testNetworkV6HashCollisions(self):
2782+
self.assertNotEqual(
2783+
ipaddress.IPv6Network("fe80::/64").__hash__(),
2784+
ipaddress.IPv6Network("fe80::ffff:ffff:ffff:0/112").__hash__()
2785+
)
2786+
self.assertNotEqual(
2787+
ipaddress.IPv4Network("10.0.0.0/8").__hash__(),
2788+
ipaddress.IPv6Network(
2789+
"ffff:ffff:ffff:ffff:ffff:ffff:aff:0/112"
2790+
).__hash__()
2791+
)
2792+
27652793

27662794
if __name__ == '__main__':
27672795
unittest.main()
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
:mod:`ipaddress`: fix collisions in :meth:`~object.__hash__` for
2+
:class:`~ipaddress.IPv4Network` and :class:`~ipaddress.IPv6Network`
3+
objects.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.