Merge "Avoid reading at negative offsets"

4 years ago · 117c6f7d41
parent 7e10198833 1b41d44972
commit 117c6f7d41
1 changed files with 3 additions and 0 deletions
--- a/media/libmediaplayerservice/datasource/PlayerServiceFileSource.cpp
+++ b/media/libmediaplayerservice/datasource/PlayerServiceFileSource.cpp
@ -71,6 +71,9 @@ ssize_t PlayerServiceFileSource::readAt(off64_t offset, void *data, size_t size)
    Mutex::Autolock autoLock(mLock);

    if (mLength >= 0) {
+        if (offset < 0) {
+            return UNKNOWN_ERROR;
+        }
        if (offset >= mLength) {
            return 0;  // read beyond EOF.
        }