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 1142835 - Null check mPlugin on GMPAudioDecoderParent shutdown - r=cpearce

Browse Source
This commit is contained in:
Edwin Flores 2015-03-30 14:58:19 +13:00
parent 0250d6859b
commit b913a19340
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/gmp/GMPAudioDecoderParent.cpp
View File

@ -140,7 +140,7 @@ nsresult
GMPAudioDecoderParent::Close() GMPAudioDecoderParent::Close()
{ {
LOGD(("%s: %p", __FUNCTION__, this)); LOGD(("%s: %p", __FUNCTION__, this));
MOZ_ASSERT(mPlugin->GMPThread() == NS_GetCurrentThread()); MOZ_ASSERT(!mPlugin || mPlugin->GMPThread() == NS_GetCurrentThread());
// Consumer is done with us; we can shut down. No more callbacks should // Consumer is done with us; we can shut down. No more callbacks should
// be made to mCallback. Note: do this before Shutdown()! // be made to mCallback. Note: do this before Shutdown()!
@ -160,7 +160,7 @@ nsresult
GMPAudioDecoderParent::Shutdown() GMPAudioDecoderParent::Shutdown()
{ {
LOGD(("%s: %p", __FUNCTION__, this)); LOGD(("%s: %p", __FUNCTION__, this));
MOZ_ASSERT(mPlugin->GMPThread() == NS_GetCurrentThread()); MOZ_ASSERT(!mPlugin || mPlugin->GMPThread() == NS_GetCurrentThread());
if (mShuttingDown) { if (mShuttingDown) {
return NS_OK; return NS_OK;