gh-156680: Raise the documented error from IPv6Network.next_network() - #156681
Open
fedonman wants to merge 1 commit into
Open
gh-156680: Raise the documented error from IPv6Network.next_network()#156681fedonman wants to merge 1 commit into
fedonman wants to merge 1 commit into
Conversation
…work() next_network() guarded address-space exhaustion with except OverflowError, which only int.to_bytes() on the IPv4 path raises. _BaseV6._string_from_ip_int() raises ValueError instead, so the handler never ran for IPv6 and the internal 'IPv6 address is too large' message escaped. Range-check next_ip against _ALL_ONES before formatting it, which decides the outcome for both address families before either path runs.
Member
Member
|
Also, reviewing fadb785 please fix the docstring of |
Member
|
Oh and one more thing. I don't quite understand why we're doing this little dance with Apologies for all the changes I've asked you to make, indeed it grew to be quite a long list. As such, here's a patch instead: --- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1124,11 +1124,15 @@ def next_network(self, next_prefix=None):
Args:
next_prefix: The desired next prefix length, if not specified the
- same self.prefixlen will be used
+ same self.prefixlen will be used.
Returns:
An IPv(4|6) Network object of the next closest network.
+ Raises:
+ ValueError: If next_prefix is outside the range of valid prefix
+ lengths, or if no further network of that size exists.
+
"""
if next_prefix is None:
next_prefix = self.prefixlen
@@ -1150,15 +1154,13 @@ def next_network(self, next_prefix=None):
((new_netmask._ip & self.network_address._ip) >> bit_shift) + 1
) << bit_shift
- try:
- return self.__class__(
- f"{self._string_from_ip_int(next_ip)}/{next_prefix}"
- )
- except OverflowError:
+ if next_ip > self._ALL_ONES:
raise ValueError(
f"out of address space, cannot make another /{next_prefix} "
"network"
- ) from None
+ )
+
+ return self.__class__((next_ip, next_prefix)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Range-check
next_ipagainst_ALL_ONESinnext_network()instead of catchingOverflowError, which only the IPv4 path raises. The IPv6 path went through_BaseV6._string_from_ip_int(), whoseValueErrorescaped uncaught.next_network()is new in 3.16 and unreleased, so this is folded into the entry the method landed with and needs no NEWS fragment.IPv6Network.next_network()raises the wrong error when addresses run out #156680