diff options
| author | Maheshwar Ajja <majja@codeaurora.org> | 2016-02-03 12:36:28 +0530 |
|---|---|---|
| committer | Maheshwar Ajja <majja@codeaurora.org> | 2016-02-04 13:02:47 +0530 |
| commit | e9bacff5d79dc89b4bf9d0e5bd0a7242ee6acac0 (patch) | |
| tree | 9987478aef5c96d108899d1bf62739052d218899 | |
| parent | e8a02eef3e98f3afc60489420aae90611e2b70a0 (diff) | |
| download | android_hardware_qcom_media-e9bacff5d79dc89b4bf9d0e5bd0a7242ee6acac0.tar.gz android_hardware_qcom_media-e9bacff5d79dc89b4bf9d0e5bd0a7242ee6acac0.tar.bz2 android_hardware_qcom_media-e9bacff5d79dc89b4bf9d0e5bd0a7242ee6acac0.zip | |
mm-video-v4l2: venc: check for null pointer
Check for null pointer to avoid video usecase failures
and use safe function strlcpy instead of strncpy.
Change-Id: Id821a971d0583ea2b72055173b71698ed34f7246
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 4 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 4 |
2 files changed, 4 insertions, 4 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 15f8b50b..8c6b3763 100644 --- a/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp +++ b/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010-2015, Linux Foundation. All rights reserved. +Copyright (c) 2010-2016, Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -4612,7 +4612,7 @@ OMX_ERRORTYPE omx_video::empty_this_buffer_opaque(OMX_IN OMX_HANDLETYPE hComp, handle = (private_handle_t *)media_buffer->meta_handle; } - if (media_buffer->buffer_type == kMetadataBufferTypeCameraSource) { + if (media_buffer && media_buffer->buffer_type == kMetadataBufferTypeCameraSource) { return empty_this_buffer_proxy(hComp, buffer); } diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp index 5148a62a..187100a3 100644 --- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp +++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp @@ -1,5 +1,5 @@ /*-------------------------------------------------------------------------- -Copyright (c) 2010-2015, The Linux Foundation. All rights reserved. +Copyright (c) 2010-2016, The Linux Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -289,7 +289,7 @@ venc_dev::venc_dev(class omx_venc *venc_class) memset(m_platform, 0, sizeof(m_platform)); if (property_get("media.msm8956hw", property_value, "0") && atoi(property_value)) { - strncpy(m_platform, "msm8956", sizeof(m_platform)); + strlcpy(m_platform, "msm8956", sizeof(m_platform)); } } |