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

Percent-decoding also applies to base64 data: URLs.

Browse source
This commit is contained in:
Simon Sapin 2014-07-19 16:57:05 +01:00
parent 609762ac63
commit 6848e78bb3
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/net/data_loader.rs
View file

@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::str;
use resource_task::{Done, Payload, Metadata, LoadData, LoadResponse, LoaderTask, start_sending}; use resource_task::{Done, Payload, Metadata, LoadData, LoadResponse, LoaderTask, start_sending};
use serialize::base64::FromBase64; use serialize::base64::FromBase64;
@ -59,21 +61,22 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
metadata.set_content_type(&content_type); metadata.set_content_type(&content_type);
let progress_chan = start_sending(start_chan, metadata); let progress_chan = start_sending(start_chan, metadata);
let bytes = percent_decode(parts.get(1).as_bytes());
if is_base64 { if is_base64 {
match (*parts.get(1)).from_base64() { // FIXME(#2877): use bytes.as_slice().from_base64() when we upgrade to a Rust version
// that includes https://github.com/rust-lang/rust/pull/15810
let fake_utf8 = unsafe { str::raw::from_utf8(bytes.as_slice()) };
match fake_utf8.from_base64() {
Err(..) => { Err(..) => {
progress_chan.send(Done(Err("non-base64 data uri".to_string()))); progress_chan.send(Done(Err("non-base64 data uri".to_string())));
} }
Ok(data) => { Ok(data) => {
let data: Vec<u8> = data; progress_chan.send(Payload(data));
progress_chan.send(Payload(data.move_iter().collect()));
progress_chan.send(Done(Ok(()))); progress_chan.send(Done(Ok(())));
} }
} }
} else { } else {
let mut bytes = Vec::new();
percent_decode(parts.get(1).as_bytes(), &mut bytes);
progress_chan.send(Payload(bytes)); progress_chan.send(Payload(bytes));
progress_chan.send(Done(Ok(()))); progress_chan.send(Done(Ok(())));
} }