| commit | bddcd757dd638c283b6c040ae91a3d3a934f0fce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Dec 24 00:51:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 24 00:51:17 2020 +0000 |
| tree | 582570f25665f1a87c641738d1578c607810f708 | |
| parent | d15d3bf294e59eac8ff4c47f4468144b74dc0f51 [diff] | |
| parent | 1e2b6013c9d9ceb39530806507b40f688f553568 [diff] |
Merge "Revert "removed the exception handling to skip the frame which data size is 0"" am: 1e2b6013c9 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1533561 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib9299e25cfb863a20443182d7567c090807ef975
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 5509512..e97f6eb 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp
@@ -813,6 +813,10 @@ baseSize = U32_AT(&mParent.mData[mOffset + 4]); } + if (baseSize == 0) { + return; + } + // Prevent integer overflow when adding if (SIZE_MAX - 10 <= baseSize) { return;