Bug 1336009 - null Java object check before accessing. r?jchen draft
authorJohn Lin <jolin@mozilla.com>
Thu, 02 Feb 2017 17:14:10 +0800
changeset 469538 5320ad3c0618f3b9c517d7f6497f5b3748a7efe6
parent 469313 ece0e0fd16a30d37249a18c41fa65143d7c01b8f
child 544232 0aee4511e6356a4a9d3c49fc752711e2ab2f310b
push id43761
push userbmo:jolin@mozilla.com
push dateThu, 02 Feb 2017 09:31:59 +0000
reviewersjchen
bugs1336009
milestone54.0a1
Bug 1336009 - null Java object check before accessing. r?jchen MozReview-Commit-ID: 8Wkr2nnXacs
dom/media/platforms/android/RemoteDataDecoder.cpp
--- 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);