Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1141386 - Don't always assume base64 encoded EME key/Ids have padding stripped. r=edwin

Browse Source
This commit is contained in:
Chris Pearce 2015-03-10 16:49:03 +13:00
parent 63caa61bcb
commit 896fc7df01
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/gmp-clearkey/0.1/ClearKeyUtils.cpp
View File

@ -383,6 +383,7 @@ Decode6Bit(string& aStr)
} else {
// Truncate '=' padding at the end of the aString.
if (aStr[i] != '=') {
aStr.erase(i, string::npos);
return false;
}
aStr[i] = '\0';
@ -397,8 +398,8 @@ Decode6Bit(string& aStr)
static bool
DecodeBase64KeyOrId(string& aEncoded, vector<uint8_t>& aOutDecoded)
{
if (aEncoded.size() != 22 || // Can't decode to 16 byte CENC key or keyId.
!Decode6Bit(aEncoded)) {
if (!Decode6Bit(aEncoded) ||
aEncoded.size() != 22) { // Can't decode to 16 byte CENC key or keyId.
return false;
}