From 23203d472ee7c6c9af8791d825a269d9bceb2fb5 Mon Sep 17 00:00:00 2001
From: Philippe Normand <philn@igalia.com>
Date: Fri, 22 Feb 2019 17:23:46 +0000
Subject: [PATCH] utils: Fix crash in filename_from_uri()

Introduced by commit 27843d0bd48b872f81da854e5d11d391ff856595.
---
 src/utils.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/utils.rs b/src/utils.rs
index 7521abb3..69767db6 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -142,7 +142,7 @@ pub fn filename_from_uri(uri: &str) -> Result<(std::path::PathBuf, Option<GStrin
         let mut hostname = ptr::null_mut();
         let mut error = ptr::null_mut();
         let ret = g_filename_from_uri(uri.to_glib_none().0, &mut hostname, &mut error);
-        if error.is_null() { Ok((from_glib_full(ret), Some(from_glib_full(hostname)))) } else { Err(from_glib_full(error)) }
+        if error.is_null() { Ok((from_glib_full(ret), from_glib_full(hostname))) } else { Err(from_glib_full(error)) }
     }
 }
 
@@ -229,4 +229,26 @@ mod tests {
         check_setenv("Test");
         check_setenv("Тест"); // "Test" in Russian
     }
+
+    #[test]
+    fn test_filename_from_uri() {
+        use gstring::GString;
+        use std::path::PathBuf;
+        let uri: GString = "file:///foo/bar.txt".into();
+        if let Ok((filename, hostname)) = ::filename_from_uri(&uri) {
+            assert_eq!(filename, PathBuf::from(r"/foo/bar.txt"));
+            assert_eq!(hostname, None);
+        } else {
+            unreachable!();
+        }
+
+        let uri: GString = "file://host/foo/bar.txt".into();
+        if let Ok((filename, hostname)) = ::filename_from_uri(&uri) {
+            assert_eq!(filename, PathBuf::from(r"/foo/bar.txt"));
+            assert_eq!(hostname, Some(GString::from("host")));
+        } else {
+            unreachable!();
+        }
+
+    }
 }