summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasantha Balla <vballa@codeaurora.org>2015-08-11 18:43:39 +0530
committerVasantha Balla <vballa@codeaurora.org>2015-08-17 19:18:29 +0530
commit21d55c230f7de07f0107bed8ded4f740cf116314 (patch)
treeb1701e6ec3ef209c88d4e0e6f75f0ae66ff0773a
parentaca7b07ceffe52bde74ab188ee0154beb9d801e5 (diff)
downloadandroid_hardware_qcom_media-21d55c230f7de07f0107bed8ded4f740cf116314.tar.gz
android_hardware_qcom_media-21d55c230f7de07f0107bed8ded4f740cf116314.tar.bz2
android_hardware_qcom_media-21d55c230f7de07f0107bed8ded4f740cf116314.zip
mm-video: vidc: Adds NULL check for ETB buffer.
Meta buffers needs to check against NULL address. This change adds the check and returns error if NULL buffer is queued to component. CRs-Fixed: 590745 Change-Id: I8483e2b19e348c1c50bb4245bfd02419983b022e
-rw-r--r--mm-video-v4l2/vidc/venc/src/omx_video_base.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
index c71c8dba..632467de 100644
--- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp
@@ -4492,6 +4492,12 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_opaque(OMX_IN OMX_HANDLETYPE hComp,
return OMX_ErrorBadParameter;
}
media_buffer = (encoder_media_buffer_type *)buffer->pBuffer;
+ if (!media_buffer || !media_buffer->meta_handle) {
+ DEBUG_PRINT_ERROR("Incorrect Buffer queued media buffer = %p meta handle = %p",
+ media_buffer, media_buffer->meta_handle);
+ m_pCallbacks.EmptyBufferDone(hComp, m_app_data, buffer);
+ return OMX_ErrorBadParameter;
+ }
private_handle_t *handle = (private_handle_t *)media_buffer->meta_handle;
/*Enable following code once private handle color format is