[automerger] Check NAL size before looking inside am: e0c020969d am:... (68e58ff3) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/avc_utils.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -330,7 +330,7 @@ static sp<ABuffer> FindNAL(const uint8_t *data, size_t size, unsigned nalType) {
		const uint8_t *nalStart;
		size_t nalSize;
		while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) {
		if ((nalStart[0] & 0x1f) == nalType) {
		if (nalSize > 0 && (nalStart[0] & 0x1f) == nalType) {
		sp<ABuffer> buffer = new ABuffer(nalSize);
		memcpy(buffer->data(), nalStart, nalSize);
		return buffer;