diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-06 20:10:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-06 20:10:25 -0700 |
| commit | 9434f72d8617cf56268158e522270a60fd79d017 (patch) | |
| tree | f6d3e300681102d3cff93ab9dbd54711892c19cb /mm-video-v4l2 | |
| parent | e8273f7654530bc3c6a24239eb0027f52cb36c67 (diff) | |
| parent | 10eb9e76ba9806f91e5e7a3fb0441af1d39e16f2 (diff) | |
| download | media-9434f72d8617cf56268158e522270a60fd79d017.tar.gz | |
Merge "Few Security fixes"
Diffstat (limited to 'mm-video-v4l2')
| -rw-r--r-- | mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp | 8 | ||||
| -rw-r--r-- | mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp b/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp index 3e2ffa2b..ad578ea7 100644 --- a/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp +++ b/mm-video-v4l2/vidc/common/src/vidc_vendor_extensions.cpp @@ -51,7 +51,7 @@ OMX_ERRORTYPE VendorExtension::copyInfoTo( OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE *ext) const { // Extension info - strncpy((char *)ext->cName, mName.c_str(), OMX_MAX_STRINGNAME_SIZE); + strlcpy((char *)ext->cName, mName.c_str(), OMX_MAX_STRINGNAME_SIZE); ext->eDir = mPortDir; ext->nParamCount = paramCount(); @@ -63,7 +63,7 @@ OMX_ERRORTYPE VendorExtension::copyInfoTo( int i = 0; for (const Param& p : mParams) { - strncpy((char *)ext->nParam[i].cKey, p.name(), OMX_MAX_STRINGNAME_SIZE); + strlcpy((char *)ext->nParam[i].cKey, p.name(), OMX_MAX_STRINGNAME_SIZE); ext->nParam[i].bSet = mIsSet ? OMX_TRUE : OMX_FALSE; ext->nParam[i].eValueType = p.type(); ++i; @@ -100,7 +100,7 @@ bool VendorExtension::setParamString( if (!_isParamAccessTypeOK(ext, paramIndex, OMX_AndroidVendorValueString)) { return false; } - strncpy((char *)ext->nParam[paramIndex].cString, setStr, OMX_MAX_STRINGVALUE_SIZE); + strlcpy((char *)ext->nParam[paramIndex].cString, setStr, OMX_MAX_STRINGVALUE_SIZE); return true; } @@ -140,7 +140,7 @@ bool VendorExtension::readParamString( return false; } if (ext->nParam[paramIndex].bSet == OMX_TRUE) { - strncpy(readStr, + strlcpy(readStr, (const char *)ext->nParam[paramIndex].cString, OMX_MAX_STRINGVALUE_SIZE); return true; } 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 7cb7084c..e0c45768 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 @@ -4536,8 +4536,7 @@ bool venc_dev::venc_set_profile(OMX_U32 eProfile) } else if (eProfile == OMX_VIDEO_AVCProfileHigh) { control.value = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH; } else { - DEBUG_PRINT_LOW("ERROR: Unsupported H.264 profile = %d", - control.value); + DEBUG_PRINT_LOW("ERROR: Unsupported H.264 profile = %d", eProfile); return false; } } else if (m_sVenc_cfg.codectype == V4L2_PIX_FMT_VP8) { @@ -4551,7 +4550,7 @@ bool venc_dev::venc_set_profile(OMX_U32 eProfile) control.value = V4L2_MPEG_VIDC_VIDEO_HEVC_PROFILE_MAIN10; } else { DEBUG_PRINT_ERROR("ERROR: Unsupported HEVC profile = %d", - control.value); + eProfile); return false; } } else { |