diff options
| author | Santhosh Behara <santhoshbehara@codeaurora.org> | 2017-10-10 21:48:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-10 21:48:39 +0000 |
| commit | 2684efbc388017db4006ac6d74f270dea887e819 (patch) | |
| tree | dc83dc0e0b9afc0f87a9a4c5503890b309588f2a /msm8996 | |
| parent | 238577213abf63d3be7d3ca18bbbd1e4a48c190b (diff) | |
| parent | 9086e5116a1bed7fc09373d8ccccca11bb7d94b2 (diff) | |
| download | media-2684efbc388017db4006ac6d74f270dea887e819.tar.gz | |
mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0
am: 9086e5116a
Change-Id: Ib3e4e55e67f23eb88c4fcc8f0f7dfa5d71886976
Diffstat (limited to 'msm8996')
| -rw-r--r-- | msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp index c9ab332..256cada 100644 --- a/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -2659,7 +2659,6 @@ OMX_ERRORTYPE omx_video::use_output_buffer( return OMX_ErrorBadParameter; } - auto_lock l(m_buf_lock); if (!m_out_mem_ptr) { output_use_buffer = true; int nBufHdrSize = 0; @@ -3585,7 +3584,6 @@ OMX_ERRORTYPE omx_video::free_buffer(OMX_IN OMX_HANDLETYPE hComp, nPortIndex, (unsigned int)m_sOutPortDef.nBufferCountActual); if (nPortIndex < m_sOutPortDef.nBufferCountActual && BITMASK_PRESENT(&m_out_bm_count, nPortIndex)) { - auto_lock l(m_buf_lock); // Clear the bit associated with it. BITMASK_CLEAR(&m_out_bm_count,nPortIndex); m_sOutPortDef.bPopulated = OMX_FALSE; |