rtsp: fix integer overflow caused by malformed packets

Bug: 123940919
Test: adb shell am start -a android.intent.action.VIEW \
  -n com.google.android.apps.photos/.pager.HostPhotoPagerActivity \
  -t video/'*' -d rtsp://<rtsp_server2.py.host>/a.mp4
Change-Id: I2ef55d218e91aa4134150895ccf49ff81bee5891
gugelfrei
Robert Shih 4 years ago
parent 01102840bc
commit 2ba16f6134

@ -338,6 +338,12 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket(
ABitReader bits(buffer->data() + offset, buffer->size() - offset);
unsigned auxSize = bits.getBits(mAuxiliaryDataSizeLength);
if (buffer->size() < auxSize) {
ALOGE("b/123940919 auxSize %u", auxSize);
android_errorWriteLog(0x534e4554, "123940919");
queue->erase(queue->begin());
return MALFORMED_PACKET;
}
offset += (mAuxiliaryDataSizeLength + auxSize + 7) / 8;
}
@ -346,6 +352,12 @@ ARTPAssembler::AssemblyStatus AMPEG4ElementaryAssembler::addPacket(
it != headers.end(); ++it) {
const AUHeader &header = *it;
if (buffer->size() < header.mSize) {
ALOGE("b/123940919 AU_size %u", header.mSize);
android_errorWriteLog(0x534e4554, "123940919");
queue->erase(queue->begin());
return MALFORMED_PACKET;
}
if (buffer->size() < offset + header.mSize) {
return MALFORMED_PACKET;
}

Loading…
Cancel
Save