| commit | 806e1cbf2f40a7f308d639b5aff09dc0bedbd16a | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 23 20:05:38 2019 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Thu May 23 20:05:38 2019 +0000 |
| tree | a89dc0f7d970c0c46a548ff8a3d5a609742bc944 | |
| parent | 9c3040568536ffbc416f39202d723c18715a9ad2 [diff] | |
| parent | ec9f664d7bbe5ff91e368694f004a9d3c86834d3 [diff] |
[automerger] Fix overflow/dos in 3gg text description parsing am: 851e22d1dc am: efeff07750 am: 93e7dd1e8b am: 0d6a0e7d88 am: ec9f664d7b Change-Id: I6b40d3da562e896569aff4981231055906ef96b0
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) {