Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 (3c375611) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -614,6 +614,7 @@ OMX_ERRORTYPE SoftAVC::initEncoder() {
		IV_STATUS_T status;
		WORD32 level;
		uint32_t displaySizeY;

		CHECK(!mStarted);

		OMX_ERRORTYPE errType = OMX_ErrorNone;
		@@ -917,6 +918,9 @@ OMX_ERRORTYPE SoftAVC::releaseEncoder() {
		}
		}

		// clear other pointers into the space being free()d
		mCodecCtx = NULL;

		mStarted = false;

		return OMX_ErrorNone;
		@@ -1509,6 +1513,14 @@ void SoftAVC::onQueueFilled(OMX_U32 portIndex) {
		return;
		}

		void SoftAVC::onReset() {
		SoftVideoEncoderOMXComponent::onReset();

		if (releaseEncoder() != OMX_ErrorNone) {
		ALOGW("releaseEncoder failed");
		}
		}

		} // namespace android

		android::SoftOMXComponent *createSoftOMXComponent(

+2 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,8 @@ struct SoftAVC : public SoftVideoEncoderOMXComponent {
		protected:
		virtual ~SoftAVC();

		virtual void onReset();

		private:
		enum {
		kNumBuffers = 2,