corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1329075 - Fix potential null deref issues in media element track sources. r=jesup

Browse Source 
MozReview-Commit-ID: ExUh2magc2z
This commit is contained in:
Andreas Pehrson
2017-01-09 17:00:43 +01:00
parent 515070fdd2
commit ff7d5fdf42
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dom/html/HTMLMediaElement.cpp
View File

@@ -2936,6 +2936,11 @@ public:
CORSMode GetCORSMode() const override
{
if (!mCapturedTrackSource) {
// This could happen during shutdown.
return CORS_NONE;
}
return mCapturedTrackSource->GetCORSMode();
}
@@ -2954,6 +2959,11 @@ public:
void PrincipalChanged() override
{
if (!mCapturedTrackSource) {
// This could happen during shutdown.
return;
}
mPrincipal = mCapturedTrackSource->GetPrincipal();
MediaStreamTrackSource::PrincipalChanged();
}
@@ -2999,10 +3009,12 @@ public:
void Destroy() override
{
MOZ_ASSERT(mElement);
DebugOnly<bool> res = mElement->RemoveDecoderPrincipalChangeObserver(this);
NS_ASSERTION(res, "Removing decoder principal changed observer failed. "
"Had it already been removed?");
if (mElement) {
DebugOnly<bool> res = mElement->RemoveDecoderPrincipalChangeObserver(this);
NS_ASSERTION(res, "Removing decoder principal changed observer failed. "
"Had it already been removed?");
mElement = nullptr;
}
}
MediaSourceEnum GetMediaSource() const override
@@ -3012,6 +3024,11 @@ public:
CORSMode GetCORSMode() const override
{
if (!mElement) {
MOZ_ASSERT(false, "Should always have an element if in use");
return CORS_NONE;
}
return mElement->GetCORSMode();
}