Skip to content

Commit 5e3b756

Browse files
committed
Auto merge of #27038 - ktossell:narrow_doc_ip_ranges, r=alexcrichton
Ipv4Addr::is_documentation() matches 513 /24 blocks when it should only match 3.
2 parents c70417b + d45c22b commit 5e3b756

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/libstd/net/ip.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ impl Ipv4Addr {
149149
/// - 203.0.113.0/24 (TEST-NET-3)
150150
pub fn is_documentation(&self) -> bool {
151151
match(self.octets()[0], self.octets()[1], self.octets()[2], self.octets()[3]) {
152-
(192, _, 2, _) => true,
152+
(192, 0, 2, _) => true,
153153
(198, 51, 100, _) => true,
154-
(203, _, 113, _) => true,
154+
(203, 0, 113, _) => true,
155155
_ => false
156156
}
157157
}
@@ -694,11 +694,15 @@ mod tests {
694694
check(&[127, 1, 2, 3], false, true, false, false, false, false, false, false);
695695
check(&[172, 31, 254, 253], false, false, true, false, false, false, false, false);
696696
check(&[169, 254, 253, 242], false, false, false, true, false, false, false, false);
697+
check(&[192, 0, 2, 183], false, false, false, false, false, false, false, true);
698+
check(&[192, 1, 2, 183], false, false, false, false, true, false, false, false);
697699
check(&[192, 168, 254, 253], false, false, true, false, false, false, false, false);
700+
check(&[198, 51, 100, 0], false, false, false, false, false, false, false, true);
701+
check(&[203, 0, 113, 0], false, false, false, false, false, false, false, true);
702+
check(&[203, 2, 113, 0], false, false, false, false, true, false, false, false);
698703
check(&[224, 0, 0, 0], false, false, false, false, true, true, false, false);
699704
check(&[239, 255, 255, 255], false, false, false, false, true, true, false, false);
700-
check(&[255, 255, 255, 255], false, false, false, false, false, false, true, false);
701-
check(&[198, 51, 100, 0], false, false, false, false, false, false, false, true);
705+
check(&[255, 255, 255, 255], false, false, false, false, false, false, true, false);
702706
}
703707

704708
#[test]

0 commit comments

Comments
 (0)