From b684cd8350a2d093005021717e416141d62dc0c8 Mon Sep 17 00:00:00 2001 From: yuzumone Date: Sat, 11 Jul 2026 22:48:58 +0900 Subject: [PATCH] fix: Reject negative IPv4 octets and IPv6 hextets --- lib/src/ipaddr_base.dart | 4 ++-- test/ipv4address_test.dart | 5 +++++ test/ipv6address_test.dart | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/src/ipaddr_base.dart b/lib/src/ipaddr_base.dart index 963d714..b756d71 100644 --- a/lib/src/ipaddr_base.dart +++ b/lib/src/ipaddr_base.dart @@ -189,7 +189,7 @@ mixin _BaseV4 { throw ValueError('At most 3 characters permitted in $x'); } var octetInt = int.tryParse(x); - if (octetInt == null || octetInt > 255) { + if (octetInt == null || octetInt < 0 || octetInt > 255) { throw ValueError('Octet $octetInt (> 255) not permitted'); } return octetInt; @@ -290,7 +290,7 @@ mixin _BaseV6 { throw ValueError('At most 4 characters permitted in $hextetStr'); } var result = int.tryParse(hextetStr, radix: 16); - if (result == null) { + if (result == null || result < 0) { throw ValueError('Only hex digits permitted in $hextetStr'); } return BigInt.from(result); diff --git a/test/ipv4address_test.dart b/test/ipv4address_test.dart index 223a7fe..338d391 100644 --- a/test/ipv4address_test.dart +++ b/test/ipv4address_test.dart @@ -149,6 +149,11 @@ void main() { expect(() => IPv4Address(fault), throwsA(TypeMatcher())); }); + test('NG: address negative octet', () { + var fault = '-1.0.0.0'; + expect(() => IPv4Address(fault), throwsA(TypeMatcher())); + }); + test('NG: plus over 4294967295', () { var addr = IPv4Address('255.255.255.255'); expect(() => addr + 100, throwsA(TypeMatcher())); diff --git a/test/ipv6address_test.dart b/test/ipv6address_test.dart index 128257b..416324b 100644 --- a/test/ipv6address_test.dart +++ b/test/ipv6address_test.dart @@ -179,6 +179,12 @@ void main() { () => IPv6Address(fault), throwsA(TypeMatcher())); }); + test('NG: address negative hextet', () { + var fault = '-1::'; + expect( + () => IPv6Address(fault), throwsA(TypeMatcher())); + }); + test('NG: address min parts', () { var fault = '2001:4860'; expect(