Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bddcd757 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "removed the exception handling to skip the frame which data... 

Merge "Revert "removed the exception handling to skip the frame which data size is 0"" am: 1e2b6013

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1533561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9299e25cfb863a20443182d7567c090807ef975
parents d15d3bf2 1e2b6013

media/libstagefright/id3/ID3.cpp

+4 −0
Original line number Diff line number Diff line
@@ -813,6 +813,10 @@ void ID3::Iterator::findFrame() { 
                baseSize = U32_AT(&mParent.mData[mOffset + 4]);

            }



            if (baseSize == 0) {

                return;

            }



            // Prevent integer overflow when adding

            if (SIZE_MAX - 10 <= baseSize) {

                return;