aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/window.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-01-25 08:07:28 -0500
committerGitHub <noreply@github.com>2019-01-25 08:07:28 -0500
commit0e99ddd6fdf1d66c8912eb0e9ef69f09f234ab52 (patch)
treeba86e3828b226ee248633948b59e0b2ff6d9150d /components/script/dom/window.rs
parentb1669b853b3462d32295431321dcb69377060df4 (diff)
parentb9371c68563fc39e6b42cce54c7ebb04d4a3a60b (diff)
downloadservo-0e99ddd6fdf1d66c8912eb0e9ef69f09f234ab52.tar.gz
servo-0e99ddd6fdf1d66c8912eb0e9ef69f09f234ab52.zip
Auto merge of #22741 - servo:bump, r=emilio
Update base64 <!-- 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/22741) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/window.rs')
-rw-r--r--components/script/dom/window.rs9
1 files changed, 3 insertions, 6 deletions
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index dce37b4f0bc..104060c25ba 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -509,12 +509,9 @@ pub fn base64_atob(input: DOMString) -> Fallible<DOMString> {
return Err(Error::InvalidCharacter);
}
- match base64::decode(&input) {
- Ok(data) => Ok(DOMString::from(
- data.iter().map(|&b| b as char).collect::<String>(),
- )),
- Err(..) => Err(Error::InvalidCharacter),
- }
+ let data = base64::decode_config(&input, base64::STANDARD.decode_allow_trailing_bits(true))
+ .map_err(|_| Error::InvalidCharacter)?;
+ Ok(data.iter().map(|&b| b as char).collect::<String>().into())
}
impl WindowMethods for Window {