diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-02-04 16:20:17 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-02-04 16:20:17 -0800 |
| commit | 862b0f489a4510386075c9d3161046e9cc2e98a7 (patch) | |
| tree | bcea9f70894389d6e9e4147f4b8aba3b15a024f7 | |
| parent | bc9e191c9214e8c5bdbd37e3cd9cfd9b67259f54 (diff) | |
| parent | e9bacff5d79dc89b4bf9d0e5bd0a7242ee6acac0 (diff) | |
| download | android_hardware_qcom_media-862b0f489a4510386075c9d3161046e9cc2e98a7.tar.gz android_hardware_qcom_media-862b0f489a4510386075c9d3161046e9cc2e98a7.tar.bz2 android_hardware_qcom_media-862b0f489a4510386075c9d3161046e9cc2e98a7.zip | |
Merge "mm-video-v4l2: venc: check for null pointer"
| -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 addc22c5..5e75911f 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: @@ -4622,7 +4622,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)); } } |