commit a221a7c81776add538e6cd82cddfa427364beb79
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 21 20:11:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 21 20:11:54 2017 +0000
tree 8bc6d44d52f2eec78227000a849010da711422bc
parent afd5242aea820b8c7118ff35b3f1b3d5ed71ef19
parent 522e43188628dc30287e3f8c69b779ecc885e7c2

Merge "avoid null dereference"

media/libstagefright/MediaCodecSource.cpp

diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index 5852dd4..cf800b2 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -643,7 +643,9 @@
 
     if (mStopping && reachedEOS) {
         ALOGI("encoder (%s) stopped", mIsVideo ? "video" : "audio");
-        mPuller->stopSource();
+        if (mPuller != NULL) {
+            mPuller->stopSource();
+        }
         ALOGV("source (%s) stopped", mIsVideo ? "video" : "audio");
         // posting reply to everyone that's waiting
         List<sp<AReplyToken>>::iterator it;