Auto merge of #21308 - paulrouget:jsonerror, r=jdm

Android: Fix JSON error when no arguments are passed

Probably fix #21298

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21308)
<!-- Reviewable:end -->

1 files changed, 8 insertions, 6 deletions

diff --git a/ports/libsimpleservo/src/api.rs b/ports/libsimpleservo/src/api.rs
index a271dda59e4..440ae2a8aa5 100644
--- a/ports/libsimpleservo/src/api.rs
+++ b/ports/libsimpleservo/src/api.rs
@@ -95,12 +95,14 @@ pub fn init(
 ) -> Result<(), &'static str> {
     resources::set(Box::new(ResourceReader(readfile)));
 
-    let mut args: Vec<String> = serde_json::from_str(&argsline).map_err(|_| {
-        "Invalid arguments. Servo arguments must be formatted as a JSON array"
-    })?;
-    // opts::from_cmdline_args expects the first argument to be the binary name.
-    args.insert(0, "servo".to_string());
-    opts::from_cmdline_args(&args);
+    if !argsline.is_empty() {
+        let mut args: Vec<String> = serde_json::from_str(&argsline).map_err(|_| {
+            "Invalid arguments. Servo arguments must be formatted as a JSON array"
+        })?;
+        // opts::from_cmdline_args expects the first argument to be the binary name.
+        args.insert(0, "servo".to_string());
+        opts::from_cmdline_args(&args);
+    }
 
     let embedder_url = embedder_url.as_ref().and_then(|s| {
         ServoUrl::parse(s).ok()