Commit 0f4a2cb7 authored Oct 11, 2020 by Treehugger Robot Committed by Automerger Merge Worker Oct 11, 2020

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

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

Change-Id: I25e37c4487ff93eb7c3373c0477dabcd9fe7faf2

media/libstagefright/id3/ID3.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -813,10 +813,6 @@ 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;