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

Assert that ImageData::data is not null

Browse source
This commit is contained in:
Anthony Ramine 2016-08-28 17:08:49 +02:00
parent fb9c36c833
commit 854a3dff68
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/script/dom/imagedata.rs
View file

@ -37,6 +37,7 @@ impl ImageData {
unsafe { unsafe {
let cx = global.get_cx(); let cx = global.get_cx();
let js_object: *mut JSObject = JS_NewUint8ClampedArray(cx, width * height * 4); let js_object: *mut JSObject = JS_NewUint8ClampedArray(cx, width * height * 4);
assert!(!js_object.is_null());
if let Some(vec) = data { if let Some(vec) = data {
let mut is_shared = false; let mut is_shared = false;
@ -58,6 +59,7 @@ impl ImageData {
let mut is_shared = false; let mut is_shared = false;
let data: *const uint8_t = let data: *const uint8_t =
JS_GetUint8ClampedArrayData(self.Data(cx), &mut is_shared, ptr::null()) as *const uint8_t; JS_GetUint8ClampedArrayData(self.Data(cx), &mut is_shared, ptr::null()) as *const uint8_t;
assert!(!data.is_null());
assert!(!is_shared); assert!(!is_shared);
let len = self.Width() * self.Height() * 4; let len = self.Width() * self.Height() * 4;
slice::from_raw_parts(data, len as usize).to_vec() slice::from_raw_parts(data, len as usize).to_vec()
@ -82,6 +84,7 @@ impl ImageDataMethods for ImageData {
// https://html.spec.whatwg.org/multipage/#dom-imagedata-data // https://html.spec.whatwg.org/multipage/#dom-imagedata-data
fn Data(&self, _: *mut JSContext) -> *mut JSObject { fn Data(&self, _: *mut JSContext) -> *mut JSObject {
assert!(!self.data.get().is_null());
self.data.get() self.data.get()
} }
} }