| commit | 3bc3a5fd22924fad691235a9ce4539715daf48ae | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jan 17 23:47:21 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 17 23:47:21 2019 +0000 |
| tree | a23f2df19192a894ebfd13e51554a90ae9e6e1e9 | |
| parent | fcc346f271902fdb6b1b610ee23100b0ecab926c [diff] | |
| parent | 7cf2914796c6a2c5419b3113508c1a8b7748ed61 [diff] |
Merge "Fix potential integer overflow in MPEG4Extractor"
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp index 0441359..262852f 100644 --- a/media/extractors/mp4/MPEG4Extractor.cpp +++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -5142,7 +5142,7 @@ sampleCtsOffset = 0; } - if (size < (off64_t)(sampleCount * bytesPerSample)) { + if (size < (off64_t)sampleCount * bytesPerSample) { return -EINVAL; }