Merge "avoid null dereference"

7 years ago · a221a7c817
parent afd5242aea 522e431886
commit a221a7c817
1 changed files with 3 additions and 1 deletions
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@ -643,7 +643,9 @@ void MediaCodecSource::signalEOS(status_t err) {

    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;