| commit | 5a4d0d3a9072c6104bac5caf262ef8bfe898fc7e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Oct 11 20:36:48 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Oct 11 20:36:48 2020 +0000 |
| tree | c3284723916c6292f9a39723fab871f68f191b4e | |
| parent | 83078ef958347e52d4f7081c3ff461bbada91d97 [diff] | |
| parent | 0f4a2cb7d607d9ef198ccc6735cd171ef8712906 [diff] |
Merge "removed the exception handling to skip the frame which data size is 0" am: f376f517f2 am: 0f4a2cb7d6 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1318776 Change-Id: Ie53ea8b211eb00a2288354863fd78843d0b5ef4c
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index e97f6eb..5509512 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp
@@ -813,10 +813,6 @@ baseSize = U32_AT(&mParent.mData[mOffset + 4]); } - if (baseSize == 0) { - return; - } - // Prevent integer overflow when adding if (SIZE_MAX - 10 <= baseSize) { return;