Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1313266 - Make gmp-clearkey reject with TypeError instead of InvalidAccessError on invalid input. r=gerald

Browse Source 
The spec expects this, and now we pass more web platform tests.

MozReview-Commit-ID: 9HJFp2ebczk

--HG--
extra : source : 6d50c9068b52d8846e4d528d150f3f3dbd9a233d
This commit is contained in:
Chris Pearce 2016-10-27 14:59:02 +13:00
parent 3cd2f0c9ea
commit d0ce61581c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/gmp-clearkey/0.1/ClearKeySession.cpp
View File

@ -78,7 +78,7 @@ ClearKeySession::Init(uint32_t aCreateSessionToken,
if (!mKeyIds.size()) {
const char message[] = "Couldn't parse init data";
mCallback->RejectPromise(aPromiseId, kGMPInvalidAccessError, message, strlen(message));
mCallback->RejectPromise(aPromiseId, kGMPTypeError, message, strlen(message));
return;
}

4
media/gmp-clearkey/0.1/ClearKeySessionManager.cpp
View File

@ -220,7 +220,7 @@ ClearKeySessionManager::UpdateSession(uint32_t aPromiseId,
// Verify the size of session response.
if (aResponseSize >= kMaxSessionResponseLength) {
CK_LOGW("Session response size is not within a reasonable size.");
mCallback->RejectPromise(aPromiseId, kGMPInvalidAccessError, nullptr, 0);
mCallback->RejectPromise(aPromiseId, kGMPTypeError, nullptr, 0);
return;
}
@ -228,7 +228,7 @@ ClearKeySessionManager::UpdateSession(uint32_t aPromiseId,
vector<KeyIdPair> keyPairs;
if (!ClearKeyUtils::ParseJWK(aResponse, aResponseSize, keyPairs, session->Type())) {
CK_LOGW("ClearKey CDM failed to parse JSON Web Key.");
mCallback->RejectPromise(aPromiseId, kGMPInvalidAccessError, nullptr, 0);
mCallback->RejectPromise(aPromiseId, kGMPTypeError, nullptr, 0);
return;
}