Merge "SampleIterator: fix sizeof bug in getSampleSizeDirect." am: d31b6e37f0 am: 55deee7015 (1f2dfe83) · Commits · e / os / android_frameworks_av

media/extractors/mp4/SampleIterator.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -244,13 +244,14 @@ status_t SampleIterator::getSampleSizeDirect(
		switch (mTable->mSampleSizeFieldSize) {
		case 32:
		{
		uint32_t x;
		if (mTable->mDataSource->readAt(
		mTable->mSampleSizeOffset + 12 + 4 * sampleIndex,
		size, sizeof(size)) < (ssize_t)sizeof(size)) {
		&x, sizeof(x)) < (ssize_t)sizeof(x)) {
		return ERROR_IO;
		}

		size = ntohl(size);
		*size = ntohl(x);
		break;
		}