From 3d8055ac96170de7a8c49b9ffbe83ed447ccddce Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Mon, 24 May 2010 09:18:36 -0700 Subject: Interestingly, a call to fseek with a NULL file handle now blocks forever... Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56 --- media/libstagefright/FileSource.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'media/libstagefright') diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index b6f1af2..dd2579b 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -45,6 +45,10 @@ status_t FileSource::initCheck() const { } ssize_t FileSource::readAt(off_t offset, void *data, size_t size) { + if (mFile == NULL) { + return NO_INIT; + } + Mutex::Autolock autoLock(mLock); if (mLength >= 0) { @@ -67,6 +71,10 @@ ssize_t FileSource::readAt(off_t offset, void *data, size_t size) { } status_t FileSource::getSize(off_t *size) { + if (mFile == NULL) { + return NO_INIT; + } + if (mLength >= 0) { *size = mLength; -- cgit v1.1