test_within_broken_database

Author: ross

src/maxminddb/lib.rs

@@ -123,10 +123,10 @@ impl<'de, T: Deserialize<'de>, S: AsRef<[u8]>> Iterator for Within<'de, T, S> {
                     &self.reader.buf.as_ref()[self.reader.pointer_base..],
                     rec,
                 );
-                return Some(Ok(WithinItem {
-                    ip_net,
-                    info: T::deserialize(&mut decoder).unwrap(),
-                }));
+                return match T::deserialize(&mut decoder) {
+                    Ok(info) => Some(Ok(WithinItem { ip_net, info })),
+                    Err(e) => Some(Err(e)),
+                };
             } else if current.node == self.node_count {
                 // Dead end, nothing to do
             } else {

src/maxminddb/reader_test.rs

@@ -386,6 +386,26 @@ fn test_within_city() {
     }
 }
 
+#[test]
+fn test_within_broken_database() {
+    use super::geoip2::City;
+    use ipnetwork::IpNetwork;
+
+    let r = Reader::open_readfile("test-data/test-data/GeoIP2-City-Test-Broken-Double-Format.mmdb")
+        .ok()
+        .unwrap();
+
+    let ip_net = IpNetwork::V6("::/0".parse().unwrap());
+    let mut iter = r.within::<City>(ip_net).unwrap();
+    match iter.next().unwrap() {
+        Err(e) => assert_eq!(
+            e,
+            MaxMindDBError::InvalidDatabaseError("double of size 7".to_string())
+        ),
+        Ok(_) => panic!("Error expected"),
+    };
+}
+
 fn check_metadata<T: AsRef<[u8]>>(reader: &Reader<T>, ip_version: usize, record_size: usize) {
     let metadata = &reader.metadata;