commit 1e2b6013c9d9ceb39530806507b40f688f553568
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 24 00:32:12 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 24 00:32:12 2020 +0000
tree 582570f25665f1a87c641738d1578c607810f708
parent 36cd37ffb8584cc7410620c7137770209d6b74f8
parent 3992a1c561bc5d39b608f996d68c9642e820522d

Merge "Revert "removed the exception handling to skip the frame which data size is 0""

media/libstagefright/id3/ID3.cpp

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;