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

Merge "Squashed commit of the following:"

Browse Source
This commit is contained in:
Andreas Huber
2010-01-14 15:01:22 -08:00
committed by Android (Google) Code Review
parent 6e8c730b9e 909255a9cf
commit 34d30d3342
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -984,7 +984,14 @@ status_t MPEG4Source::read(
(const uint8_t *)mBuffer->data() + mBuffer->range_offset();
size_t nal_size = parseNALSize(src);
CHECK(mBuffer->range_length() >= mNALLengthSize + nal_size);
if (mBuffer->range_length() < mNALLengthSize + nal_size) {
LOGE("incomplete NAL unit.");
mBuffer->release();
mBuffer = NULL;
return ERROR_MALFORMED;
}
MediaBuffer *clone = mBuffer->clone();
clone->set_range(mBuffer->range_offset() + mNALLengthSize, nal_size);
@@ -1023,7 +1030,13 @@ status_t MPEG4Source::read(
CHECK(srcOffset + mNALLengthSize <= size);
size_t nalLength = parseNALSize(&mSrcBuffer[srcOffset]);
srcOffset += mNALLengthSize;
CHECK(srcOffset + nalLength <= size);
if (srcOffset + nalLength > size) {
mBuffer->release();
mBuffer = NULL;
return ERROR_MALFORMED;
}
if (nalLength == 0) {
continue;