python
diff --git a/‎Lib/ipaddress.py
Copy file name to clipboardExpand all lines: Lib/ipaddress.py
+3Lines changed: 3 additions & 0 deletions b/‎Lib/ipaddress.py
Copy file name to clipboardExpand all lines: Lib/ipaddress.py
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎Lib/test/test_ipaddress.py
Copy file name to clipboardExpand all lines: Lib/test/test_ipaddress.py
+10-1Lines changed: 10 additions & 1 deletion b/‎Lib/test/test_ipaddress.py
Copy file name to clipboardExpand all lines: Lib/test/test_ipaddress.py
+10-1Lines changed: 10 additions & 1 deletion
diff --git a/‎Misc/NEWS.d/next/Security/2025-01-14-11-19-07.gh-issue-128840.M1doZW.rst
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎Misc/NEWS.d/next/Security/2025-01-14-11-19-07.gh-issue-128840.M1doZW.rst
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
@@ -1660,6 +1660,9 @@ def _ip_int_from_string(cls, ip_str):
         """
         if not ip_str:
             raise AddressValueError('Address cannot be empty')
+        if len(ip_str) > 39:
+            msg = "At most 39 characters expected in %r" % (ip_str,)
+            raise AddressValueError(msg)
 
         # We want to allow more parts than the max to be 'split'
         # to preserve the correct error message when there are
 
@@ -396,8 +396,17 @@ def assertBadSplit(addr):
         assertBadSplit("8:7:6:5:4:3:2:1::%scope")
         # A trailing IPv4 address is two parts
         assertBadSplit("10:9:8:7:6:5:4:3:42.42.42.42%scope")
+
+    def test_bad_address_split_v6_too_long(self):
+        def assertBadSplit(addr):
+            msg = "At most 39 characters expected in %r"
+            with self.assertAddressError(msg, addr.split('%')[0]):
+                ipaddress.IPv6Address(addr)
+
         # Long IPv6 address
-        assertBadSplit(("0:" * 10000) + "0")
+        long_addr = ("0:" * 10000) + "0"
+        assertBadSplit(long_addr)
+        assertBadSplit(long_addr + "%zoneid")
 
     def test_bad_address_split_v6_too_many_parts(self):
         def assertBadSplit(addr):
 
@@ -1,3 +1,2 @@
-Limit the number of splitting on colons (``:``) that will occur while parsing
-an IPv6 address. This prevents excessive memory consumption and potential
-denial-of-service when parsing a large IPv6 address.
+Short-circuit the processing of long IPv6 addresses early to prevent excessive
+memory consumption and a minor denial-of-service.