Bug 1336009 - null Java object check before accessing. r?jchen
MozReview-Commit-ID: 8Wkr2nnXacs
--- a/dom/media/platforms/android/RemoteDataDecoder.cpp
+++ b/dom/media/platforms/android/RemoteDataDecoder.cpp
@@ -593,23 +593,26 @@ RemoteDataDecoder::Drain()
mJavaDecoder->Input(nullptr, bufferInfo, nullptr);
}
void
RemoteDataDecoder::Shutdown()
{
LOG("");
- MOZ_ASSERT(mJavaDecoder && mJavaCallbacks);
- mJavaDecoder->Release();
- mJavaDecoder = nullptr;
+ if (mJavaDecoder) {
+ mJavaDecoder->Release();
+ mJavaDecoder = nullptr;
+ }
- JavaCallbacksSupport::GetNative(mJavaCallbacks)->Cancel();
- mJavaCallbacks = nullptr;
+ if (mJavaCallbacks) {
+ JavaCallbacksSupport::GetNative(mJavaCallbacks)->Cancel();
+ mJavaCallbacks = nullptr;
+ }
mFormat = nullptr;
}
void
RemoteDataDecoder::Input(MediaRawData* aSample)
{
MOZ_ASSERT(aSample != nullptr);