wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1140797 - Prevent fatal assert when doing base64 decode in gmp-clearkey. r=edwin

Browse Source
This commit is contained in:
Chris Pearce 2015-03-09 08:27:18 +13:00
parent 512ef32e2f
commit fecff1aecf
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,24 +395,29 @@ Decode6Bit(string& aStr)
}
static bool
DecodeBase64(string& aEncoded, vector<uint8_t>& aOutDecoded)
DecodeBase64KeyOrId(string& aEncoded, vector<uint8_t>& aOutDecoded)
{
if (!Decode6Bit(aEncoded)) {
if (aEncoded.size() != 22 || // Can't decode to 16 byte CENC key or keyId.
!Decode6Bit(aEncoded)) {
return false;
}
// The number of bytes we haven't yet filled in the current byte, mod 8.
int shift = 0;
aOutDecoded.resize(aEncoded.length() * 6 / 8);
aOutDecoded.reserve(aEncoded.length() * 6 / 8 + 1);
auto out = aOutDecoded.begin();
aOutDecoded.resize(16);
vector<uint8_t>::iterator out = aOutDecoded.begin();
for (size_t i = 0; i < aEncoded.length(); i++) {
if (!shift) {
*out = aEncoded[i] << 2;
} else {
*out |= aEncoded[i] >> (6 - shift);
*(++out) = aEncoded[i] << (shift + 2);
out++;
if (out == aOutDecoded.end()) {
// Hit last 6bit octed in encoded, which is padding and can be ignored.
break;
}
*out = aEncoded[i] << (shift + 2);
}
shift = (shift + 2) % 8;
}
@ -423,7 +428,8 @@ DecodeBase64(string& aEncoded, vector<uint8_t>& aOutDecoded)
static bool
DecodeKey(string& aEncoded, Key& aOutDecoded)
{
return DecodeBase64(aEncoded, aOutDecoded) &&
return
DecodeBase64KeyOrId(aEncoded, aOutDecoded) &&
// Key should be 128 bits long.
aOutDecoded.size() == CLEARKEY_KEY_LEN;
}
@ -477,7 +483,7 @@ ParseKeyObject(ParserContext& aCtx, KeyIdPair& aOutKey)
return !key.empty() &&
!keyId.empty() &&
DecodeBase64(keyId, aOutKey.mKeyId) &&
DecodeBase64KeyOrId(keyId, aOutKey.mKeyId) &&
DecodeKey(key, aOutKey.mKey) &&
GetNextSymbol(aCtx) == '}';
}