diff options
author | Andreas Huber <andih@google.com> | 2010-05-24 09:18:36 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-05-24 09:24:02 -0700 |
commit | 3d8055ac96170de7a8c49b9ffbe83ed447ccddce (patch) | |
tree | f12dc5696f8436c9a304beffd039d27377a56f81 /media/libstagefright/FileSource.cpp | |
parent | 6b19faca7040ba4ef67637801926ead2559c22e9 (diff) | |
download | frameworks_av-3d8055ac96170de7a8c49b9ffbe83ed447ccddce.zip frameworks_av-3d8055ac96170de7a8c49b9ffbe83ed447ccddce.tar.gz frameworks_av-3d8055ac96170de7a8c49b9ffbe83ed447ccddce.tar.bz2 |
Interestingly, a call to fseek with a NULL file handle now blocks forever...
Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56
Diffstat (limited to 'media/libstagefright/FileSource.cpp')
-rw-r--r-- | media/libstagefright/FileSource.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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; |