diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 15:20:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-16 15:20:33 -0700 |
| commit | 876742d2526fdf03190dad2ab9deb76b7c02939f (patch) | |
| tree | 84dc5369e67cca93ece62c973b9efcc1908c5c0c /media | |
| parent | 102dfe09e7b58efc2d67c212779d2ac3a0be5204 (diff) | |
| parent | 104fcb88d4125caff74f63be4ce23537ca693ac7 (diff) | |
| download | frameworks_av-876742d2526fdf03190dad2ab9deb76b7c02939f.zip frameworks_av-876742d2526fdf03190dad2ab9deb76b7c02939f.tar.gz frameworks_av-876742d2526fdf03190dad2ab9deb76b7c02939f.tar.bz2 | |
Merge "Make sure the .wav extractor does not read data outside the bounds of the 'data' box." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/WAVExtractor.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/media/libstagefright/WAVExtractor.cpp b/media/libstagefright/WAVExtractor.cpp index 57c1075..aff06bc 100644 --- a/media/libstagefright/WAVExtractor.cpp +++ b/media/libstagefright/WAVExtractor.cpp @@ -331,9 +331,20 @@ status_t WAVSource::read( return err; } + size_t maxBytesToRead = + mBitsPerSample == 8 ? kMaxFrameSize / 2 : kMaxFrameSize; + + size_t maxBytesAvailable = + (mCurrentPos - mOffset >= (off_t)mSize) + ? 0 : mSize - (mCurrentPos - mOffset); + + if (maxBytesToRead > maxBytesAvailable) { + maxBytesToRead = maxBytesAvailable; + } + ssize_t n = mDataSource->readAt( mCurrentPos, buffer->data(), - mBitsPerSample == 8 ? kMaxFrameSize / 2 : kMaxFrameSize); + maxBytesToRead); if (n <= 0) { buffer->release(); |