Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51d6cc75 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "FileSource may fail to open a file in which case subsequent code... 

Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem."
parents 6d309134 4e657296

media/libstagefright/FileSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ namespace android { 


FileSource::FileSource(const char *filename)

    : mFile(fopen(filename, "rb")),

      mFd(fileno(mFile)),

      mFd(mFile == NULL ? -1 : fileno(mFile)),

      mOffset(0),

      mLength(-1),

      mDecryptHandle(NULL),