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 688516 - Null check mElement before use in NotifyDownloadEnded and AudioAvailable. r=cpearce

Browse Source
This commit is contained in:
Matthew Gregan 2011-09-23 16:27:18 +12:00
parent ba7be2f99c
commit 8579719cfc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/media/nsBuiltinDecoder.cpp
View File

@ -402,7 +402,7 @@ void nsBuiltinDecoder::AudioAvailable(float* aFrameBuffer,
return; return;
} }
if (!mElement->MayHaveAudioAvailableEventListener()) { if (!mElement || !mElement->MayHaveAudioAvailableEventListener()) {
return; return;
} }
@ -442,8 +442,7 @@ void nsBuiltinDecoder::MetadataLoaded(PRUint32 aChannels,
if (!mResourceLoaded) { if (!mResourceLoaded) {
StartProgress(); StartProgress();
} } else if (mElement) {
else if (mElement) {
// Resource was loaded during metadata loading, when progress // Resource was loaded during metadata loading, when progress
// events are being ignored. Fire the final progress event. // events are being ignored. Fire the final progress event.
mElement->DispatchAsyncEvent(NS_LITERAL_STRING("progress")); mElement->DispatchAsyncEvent(NS_LITERAL_STRING("progress"));
@ -664,7 +663,9 @@ void nsBuiltinDecoder::NotifyDownloadEnded(nsresult aStatus)
if (aStatus == NS_BINDING_ABORTED) { if (aStatus == NS_BINDING_ABORTED) {
// Download has been cancelled by user. // Download has been cancelled by user.
mElement->LoadAborted(); if (mElement) {
mElement->LoadAborted();
}
return; return;
} }

2
content/media/nsMediaDecoder.cpp
View File

@ -71,7 +71,7 @@ static const PRUint32 STALL_MS = 3000;
static const PRInt64 CAN_PLAY_THROUGH_MARGIN = 10; static const PRInt64 CAN_PLAY_THROUGH_MARGIN = 10;
nsMediaDecoder::nsMediaDecoder() : nsMediaDecoder::nsMediaDecoder() :
mElement(0), mElement(nsnull),
mRGBWidth(-1), mRGBWidth(-1),
mRGBHeight(-1), mRGBHeight(-1),
mVideoUpdateLock("nsMediaDecoder.mVideoUpdateLock"), mVideoUpdateLock("nsMediaDecoder.mVideoUpdateLock"),