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

handle null args

Browse source
This commit is contained in:
Paul Rouget 2019-06-06 08:16:26 +02:00
parent 7a5ce048d2
commit 2fb6cc6f4d
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ports/libsimpleservo/capi/src/lib.rs
View file

@ -75,13 +75,16 @@ fn init(
) { ) {
crate::env_logger::init(); crate::env_logger::init();
let args = unsafe { CStr::from_ptr(opts.args) }; let args = if !opts.args.is_null() {
let args = args let args = unsafe { CStr::from_ptr(opts.args) };
.to_str() args.to_str()
.unwrap_or("") .unwrap_or("")
.split(' ') .split(' ')
.map(|s| s.to_owned()) .map(|s| s.to_owned())
.collect(); .collect()
} else {
vec![]
};
let url = unsafe { CStr::from_ptr(opts.url) }; let url = unsafe { CStr::from_ptr(opts.url) };
let url = url.to_str().map(|s| s.to_string()).ok(); let url = url.to_str().map(|s| s.to_string()).ok();