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

Remove some usage of unsafe code in XMLHttpRequest

Browse source
This commit is contained in:
marmeladema 2019-07-27 15:57:06 +01:00
parent 1d92796b03
commit 5ca3dd9d05
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/xmlhttprequest.rs
View file

@ -38,7 +38,7 @@ use crate::dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget;
use crate::dom::xmlhttprequestupload::XMLHttpRequestUpload; use crate::dom::xmlhttprequestupload::XMLHttpRequestUpload;
use crate::fetch::FetchCanceller; use crate::fetch::FetchCanceller;
use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener}; use crate::network_listener::{self, NetworkListener, PreInvoke, ResourceTimingListener};
use crate::script_runtime::JSContext as SafeJSContext; use crate::script_runtime::JSContext;
use crate::task_source::networking::NetworkingTaskSource; use crate::task_source::networking::NetworkingTaskSource;
use crate::task_source::TaskSourceName; use crate::task_source::TaskSourceName;
use crate::timers::{OneshotTimerCallback, OneshotTimerHandle}; use crate::timers::{OneshotTimerCallback, OneshotTimerHandle};
@ -54,7 +54,7 @@ use hyper_serde::Serde;
use ipc_channel::ipc; use ipc_channel::ipc;
use ipc_channel::router::ROUTER; use ipc_channel::router::ROUTER;
use js::jsapi::JS_ClearPendingException; use js::jsapi::JS_ClearPendingException;
use js::jsapi::{Heap, JSContext, JSObject}; use js::jsapi::{Heap, JSObject};
use js::jsval::{JSVal, NullValue, UndefinedValue}; use js::jsval::{JSVal, NullValue, UndefinedValue};
use js::rust::wrappers::JS_ParseJSON; use js::rust::wrappers::JS_ParseJSON;
use js::typedarray::{ArrayBuffer, CreateWith}; use js::typedarray::{ArrayBuffer, CreateWith};
@ -878,7 +878,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
#[allow(unsafe_code)] #[allow(unsafe_code)]
// https://xhr.spec.whatwg.org/#the-response-attribute // https://xhr.spec.whatwg.org/#the-response-attribute
fn Response(&self, cx: SafeJSContext) -> JSVal { fn Response(&self, cx: JSContext) -> JSVal {
rooted!(in(*cx) let mut rval = UndefinedValue()); rooted!(in(*cx) let mut rval = UndefinedValue());
match self.response_type.get() { match self.response_type.get() {
XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Text => unsafe { XMLHttpRequestResponseType::_empty | XMLHttpRequestResponseType::Text => unsafe {
@ -902,16 +902,14 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
self.document_response().to_jsval(*cx, rval.handle_mut()); self.document_response().to_jsval(*cx, rval.handle_mut());
}, },
XMLHttpRequestResponseType::Json => unsafe { XMLHttpRequestResponseType::Json => unsafe {
self.json_response(*cx).to_jsval(*cx, rval.handle_mut()); self.json_response(cx).to_jsval(*cx, rval.handle_mut());
}, },
XMLHttpRequestResponseType::Blob => unsafe { XMLHttpRequestResponseType::Blob => unsafe {
self.blob_response().to_jsval(*cx, rval.handle_mut()); self.blob_response().to_jsval(*cx, rval.handle_mut());
}, },
XMLHttpRequestResponseType::Arraybuffer => unsafe { XMLHttpRequestResponseType::Arraybuffer => match self.arraybuffer_response(cx) {
match self.arraybuffer_response(*cx) { Some(js_object) => unsafe { js_object.to_jsval(*cx, rval.handle_mut()) },
Some(js_object) => js_object.to_jsval(*cx, rval.handle_mut()),
None => return NullValue(), None => return NullValue(),
}
}, },
} }
rval.get() rval.get()
@ -1278,7 +1276,7 @@ impl XMLHttpRequest {
// https://xhr.spec.whatwg.org/#arraybuffer-response // https://xhr.spec.whatwg.org/#arraybuffer-response
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn arraybuffer_response(&self, cx: *mut JSContext) -> Option<NonNull<JSObject>> { fn arraybuffer_response(&self, cx: JSContext) -> Option<NonNull<JSObject>> {
// Step 1 // Step 1
let created = self.response_arraybuffer.get(); let created = self.response_arraybuffer.get();
if let Some(nonnull) = NonNull::new(created) { if let Some(nonnull) = NonNull::new(created) {
@ -1287,14 +1285,16 @@ impl XMLHttpRequest {
// Step 2 // Step 2
let bytes = self.response.borrow(); let bytes = self.response.borrow();
rooted!(in(cx) let mut array_buffer = ptr::null_mut::<JSObject>()); rooted!(in(*cx) let mut array_buffer = ptr::null_mut::<JSObject>());
ArrayBuffer::create(cx, CreateWith::Slice(&bytes), array_buffer.handle_mut()) unsafe {
ArrayBuffer::create(*cx, CreateWith::Slice(&bytes), array_buffer.handle_mut())
.ok() .ok()
.and_then(|()| { .and_then(|()| {
self.response_arraybuffer.set(array_buffer.get()); self.response_arraybuffer.set(array_buffer.get());
Some(NonNull::new_unchecked(array_buffer.get())) Some(NonNull::new_unchecked(array_buffer.get()))
}) })
} }
}
// https://xhr.spec.whatwg.org/#document-response // https://xhr.spec.whatwg.org/#document-response
fn document_response(&self) -> Option<DomRoot<Document>> { fn document_response(&self) -> Option<DomRoot<Document>> {
@ -1345,7 +1345,7 @@ impl XMLHttpRequest {
#[allow(unsafe_code)] #[allow(unsafe_code)]
// https://xhr.spec.whatwg.org/#json-response // https://xhr.spec.whatwg.org/#json-response
fn json_response(&self, cx: *mut JSContext) -> JSVal { fn json_response(&self, cx: JSContext) -> JSVal {
// Step 1 // Step 1
let response_json = self.response_json.get(); let response_json = self.response_json.get();
if !response_json.is_null_or_undefined() { if !response_json.is_null_or_undefined() {
@ -1378,15 +1378,15 @@ impl XMLHttpRequest {
// if present, but UTF-16BE/LE BOM must not be honored. // if present, but UTF-16BE/LE BOM must not be honored.
let json_text = decode_to_utf16_with_bom_removal(&bytes, UTF_8); let json_text = decode_to_utf16_with_bom_removal(&bytes, UTF_8);
// Step 5 // Step 5
rooted!(in(cx) let mut rval = UndefinedValue()); rooted!(in(*cx) let mut rval = UndefinedValue());
unsafe { unsafe {
if !JS_ParseJSON( if !JS_ParseJSON(
cx, *cx,
json_text.as_ptr(), json_text.as_ptr(),
json_text.len() as u32, json_text.len() as u32,
rval.handle_mut(), rval.handle_mut(),
) { ) {
JS_ClearPendingException(cx); JS_ClearPendingException(*cx);
return NullValue(); return NullValue();
} }
} }