Merge "Fix benign unsigned integer overflows" (c92d887a) · Commits · e / os / android_frameworks_av

media/libstagefright/httplive/PlaylistFetcher.cpp

+6 −3

Original line number	Diff line number	Diff line
		@@ -1628,7 +1628,8 @@ status_t PlaylistFetcher::extractAndQueueAccessUnitsFromTs(const sp<ABuffer> &bu

		if (mSegmentFirstPTS < 0ll) {
		// get the smallest first PTS from all streams present in this parser
		for (size_t i = mPacketSources.size(); i-- > 0;) {
		for (size_t i = mPacketSources.size(); i > 0;) {
		i--;
		const LiveSession::StreamType stream = mPacketSources.keyAt(i);
		if (stream == LiveSession::STREAMTYPE_SUBTITLES) {
		ALOGE("MPEG2 Transport streams do not contain subtitles.");
		@@ -1683,7 +1684,8 @@ status_t PlaylistFetcher::extractAndQueueAccessUnitsFromTs(const sp<ABuffer> &bu
		}

		status_t err = OK;
		for (size_t i = mPacketSources.size(); i-- > 0;) {
		for (size_t i = mPacketSources.size(); i > 0;) {
		i--;
		sp<AnotherPacketSource> packetSource = mPacketSources.valueAt(i);

		const LiveSession::StreamType stream = mPacketSources.keyAt(i);
		@@ -1807,7 +1809,8 @@ status_t PlaylistFetcher::extractAndQueueAccessUnitsFromTs(const sp<ABuffer> &bu
		}

		if (err != OK) {
		for (size_t i = mPacketSources.size(); i-- > 0;) {
		for (size_t i = mPacketSources.size(); i > 0;) {
		i--;
		sp<AnotherPacketSource> packetSource = mPacketSources.valueAt(i);
		packetSource->clear();
		}