| commit | ec9f664d7bbe5ff91e368694f004a9d3c86834d3 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 23 20:05:36 2019 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 23 20:05:36 2019 +0000 |
| tree | c54a836abacb0f0336a5a09ce1585f9466b68e7e | |
| parent | 56b857516b698a6ff10bdeb29ec4206a6bfe44a9 [diff] | |
| parent | 0d6a0e7d8882a45a435d73e16b40dde6d807a935 [diff] |
[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 Change-Id: I27ce9e2b1bb78b7f716ac593cb98a4de9d77f5c3
diff --git a/media/libstagefright/timedtext/TextDescriptions.cpp b/media/libstagefright/timedtext/TextDescriptions.cpp index c762a74..83d15a2 100644 --- a/media/libstagefright/timedtext/TextDescriptions.cpp +++ b/media/libstagefright/timedtext/TextDescriptions.cpp
@@ -383,7 +383,7 @@ tmpData += 8; size_t remaining = size - 8; - if (size < chunkSize) { + if (chunkSize <= 8 || size < chunkSize) { return OK; } switch(chunkType) {