summaryrefslogtreecommitdiff
path: root/msm8996
diff options
context:
space:
mode:
authorSanthosh Behara <santhoshbehara@codeaurora.org>2017-10-10 21:53:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-10 21:53:31 +0000
commit1991311b393eb8399607f6e7661e6603b640d396 (patch)
treef0c82eddad38c31888af8c1c0cc08b8da7d2ae66 /msm8996
parent79202f83422e3aabb5e0f3d19d8c6991b7aaa325 (diff)
parent03fdd22ce8e21cd52c5343d7d27e50750d18781e (diff)
downloadmedia-1991311b393eb8399607f6e7661e6603b640d396.tar.gz
mm-video-v4l2: venc: Avoid buffer access after free am: b701fb182b am: 6533d3dd97 am: 2d39f9e2b0 am: 9086e5116a am: 2684efbc38
am: 03fdd22ce8 Change-Id: I28381d44a361fdf8748f497082c2da822fb09b7b
Diffstat (limited to 'msm8996')
-rw-r--r--msm8996/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp2
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 d451e78..f9282d4 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
@@ -2669,7 +2669,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;
@@ -3603,7 +3602,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;