From 7459b018db9aecea809add574cfa1b5ca72c47dd Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 27 Oct 2010 10:33:04 -0700 Subject: [PATCH] FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem. Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683 --- media/libstagefright/FileSource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index b46d8d0ee38dc..e4f9a47d735cd 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -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),