handle null args

servo · Jun 6, 2019 · 2fb6cc6 · 2fb6cc6
1 parent 7a5ce04
commit 2fb6cc6
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/ports/libsimpleservo/capi/src/lib.rs b/ports/libsimpleservo/capi/src/lib.rs
@@ -75,13 +75,16 @@ fn init(
 ) {
     crate::env_logger::init();
 
-    let args = unsafe { CStr::from_ptr(opts.args) };
-    let args = args
-        .to_str()
-        .unwrap_or("")
-        .split(' ')
-        .map(|s| s.to_owned())
-        .collect();
+    let args = if !opts.args.is_null() {
+        let args = unsafe { CStr::from_ptr(opts.args) };
+        args.to_str()
+            .unwrap_or("")
+            .split(' ')
+            .map(|s| s.to_owned())
+            .collect()
+    } else {
+        vec![]
+    };
 
     let url = unsafe { CStr::from_ptr(opts.url) };
     let url = url.to_str().map(|s| s.to_string()).ok();