From a70aa7c9155d535a555914ac0190bba04b2074a0 Mon Sep 17 00:00:00 2001 From: Karthikeyan Periasamy Date: Mon, 23 Oct 2017 17:24:15 -0700 Subject: mm-video-v4l2: libstagefrighth: Fix kw issues Check the array variable for the allocation failure. CRs-Fixed: 2135174 Change-Id: I0db1ab237a802bbbd0960abad2973d4632c1f368 --- mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mm-video-v4l2/vidc/vdec/src') diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp index 08bffb16..c87add88 100644 --- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp +++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp @@ -81,8 +81,10 @@ OMX_ERRORTYPE omx_vdec::get_vendor_extension_config( char exType[OMX_MAX_STRINGVALUE_SIZE + 1]; memset (exType, 0, (sizeof(char)*OMX_MAX_STRINGVALUE_SIZE)); if ((OMX_BOOL)(client_extradata & OMX_OUTPUTCROP_EXTRADATA)){ - if ((strlcat(exType, getStringForExtradataType(OMX_ExtraDataOutputCropInfo), - OMX_MAX_STRINGVALUE_SIZE)) >= OMX_MAX_STRINGVALUE_SIZE) { + const char * outputCropInfo = getStringForExtradataType(OMX_ExtraDataOutputCropInfo); + if (outputCropInfo != NULL && + (strlcat(exType, outputCropInfo, + OMX_MAX_STRINGVALUE_SIZE)) >= OMX_MAX_STRINGVALUE_SIZE) { DEBUG_PRINT_LOW("extradata string size exceeds size %d",OMX_MAX_STRINGVALUE_SIZE); } } -- cgit v1.2.3