Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a7516e90: Merge "Make sure the .wav extractor does not read data outside the bounds of the \'data\' box." into gingerbread

Browse Source 
Merge commit 'a7516e90d01a22d17a470695eefa905e0ff066cc' into gingerbread-plus-aosp

* commit 'a7516e90d01a22d17a470695eefa905e0ff066cc':
  Make sure the .wav extractor does not read data outside the bounds of the 'data' box.
This commit is contained in:
Andreas Huber
2010-09-16 16:02:33 -07:00
committed by Android Git Automerger
parent 23c6ad7aed a7516e90d0
commit 92aa28addd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/libstagefright/WAVExtractor.cpp
View File

@@ -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();