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

Auto merge of #23501 - paulrouget:nullcheck, r=jdm

Browse source 
handle null args pointer

<!-- 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/23501)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-06 03:14:11 -04:00 • committed by GitHub
commit 347d8bdf72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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();
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();