Merge "DO NOT MERGE Fix vulnerability in mediaserver" into lmp-dev (160ed868) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libmedia/ICrypto.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ status_t BnCrypto::onTransact(

		size_t totalSize = data.readInt32();
		void *srcData = malloc(totalSize);
		memset(srcData, 0, totalSize);
		data.read(srcData, totalSize);

		int32_t numSubSamples = data.readInt32();
		@@ -252,6 +253,7 @@ status_t BnCrypto::onTransact(
		secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));
		} else {
		dstPtr = malloc(totalSize);
		memset(dstPtr, 0, totalSize);
		}

		AString errorDetailMsg;