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 1097823 - Followup to avoid null-derefing when promises have already been rejected during shutdown. rpending=cpearce

Browse Source
This commit is contained in:
Bobby Holley 2014-12-07 15:08:47 -08:00
parent b007d59daf
commit eab5796fe5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/media/MediaDecoderReader.h
View File

@ -315,6 +315,9 @@ private:
bool mAudioDiscontinuity;
bool mVideoDiscontinuity;
bool mShutdown;
public:
bool IsShutdown() { return mShutdown; }
};
// Interface that callers to MediaDecoderReader::Request{Audio,Video}Data()

12
dom/media/mediasource/MediaSourceReader.cpp
View File

@ -170,7 +170,11 @@ MediaSourceReader::OnAudioNotDecoded(NotDecodedReason aReason)
{
MSE_DEBUG("MediaSourceReader(%p)::OnAudioNotDecoded aReason=%u IsEnded: %d", this, aReason, IsEnded());
if (aReason == DECODE_ERROR || aReason == CANCELED) {
mAudioPromise.Reject(aReason, __func__);
if (!mAudioPromise.IsEmpty()) {
mAudioPromise.Reject(aReason, __func__);
} else {
MOZ_ASSERT(IsShutdown(), "This only happens when shutdown clears the promise");
}
return;
}
@ -260,7 +264,11 @@ MediaSourceReader::OnVideoNotDecoded(NotDecodedReason aReason)
{
MSE_DEBUG("MediaSourceReader(%p)::OnVideoNotDecoded aReason=%u IsEnded: %d", this, aReason, IsEnded());
if (aReason == DECODE_ERROR || aReason == CANCELED) {
mVideoPromise.Reject(aReason, __func__);
if (!mVideoPromise.IsEmpty()) {
mVideoPromise.Reject(aReason, __func__);
} else {
MOZ_ASSERT(IsShutdown(), "This only happens when shutdown clears the promise");
}
return;
}