Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Android: Fix JSON error when no arguments are passed

Browse source
This commit is contained in:
Paul Rouget 2018-08-01 21:01:49 +08:00
parent 3e09d7270a
commit fb8d8b33ac
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ports/libsimpleservo/src/api.rs
View file

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