Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09 (17d791ad) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/SampleTable.cpp

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -701,9 +701,15 @@ void SampleTable::buildSampleEntriesTable() {
	}		}

	++sampleIndex;		++sampleIndex;
			if (sampleTime > UINT32_MAX - delta) {
			ALOGE("%u + %u would overflow, clamping",
			sampleTime, delta);
			sampleTime = UINT32_MAX;
			} else {
	sampleTime += delta;		sampleTime += delta;
	}		}
	}		}
			}

	qsort(mSampleTimeEntries, mNumSampleSizes, sizeof(SampleTimeEntry),		qsort(mSampleTimeEntries, mNumSampleSizes, sizeof(SampleTimeEntry),
	CompareIncreasingTime);		CompareIncreasingTime);