summaryrefslogtreecommitdiff
path: root/gstcs/mm_util_gstcs.c
diff options
context:
space:
mode:
authorJiyong Min <jiyong.min@samsung.com>2017-04-19 18:42:23 +0900
committerJiyong Min <jiyong.min@samsung.com>2017-04-20 10:10:22 +0900
commit7f8e3db4b6fcea6256c42cc292f11940209db132 (patch)
tree422600cc162c1eb688cc897070bbb67f43f33d13 /gstcs/mm_util_gstcs.c
parentc189ecb942d9c4565198f903aeb46d29c3495af2 (diff)
downloadlibmm-imgp-gstcs-7f8e3db4b6fcea6256c42cc292f11940209db132.tar.gz
libmm-imgp-gstcs-7f8e3db4b6fcea6256c42cc292f11940209db132.tar.bz2
libmm-imgp-gstcs-7f8e3db4b6fcea6256c42cc292f11940209db132.zip
Svace issue fix. change strncpy to g_strlcpysubmit/tizen/20170421.002420accepted/tizen/unified/20170421.041816
Change-Id: I8a4701548115d7afada4f4126218d2fded6cba3b Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
Diffstat (limited to 'gstcs/mm_util_gstcs.c')
-rwxr-xr-xgstcs/mm_util_gstcs.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/gstcs/mm_util_gstcs.c b/gstcs/mm_util_gstcs.c
index a56ee53..41ccb59 100755
--- a/gstcs/mm_util_gstcs.c
+++ b/gstcs/mm_util_gstcs.c
@@ -27,6 +27,8 @@
#define MM_UTIL_ROUND_UP_8(num) (((num)+7)&~7)
#define MM_UTIL_ROUND_UP_16(num) (((num)+15)&~15)
+#define SAFE_STRCPY(dst, src, n) g_strlcpy(dst, src, n)
+
static GstFlowReturn
_mm_sink_sample(GstElement * appsink, gpointer user_data)
@@ -214,9 +216,9 @@ _mm_set_image_input_format_s_capabilities(image_format_s* __format) /*_format_la
|| strcmp(__format->format_label, "YV12") == 0
|| strcmp(__format->format_label, "NV12") == 0
|| strcmp(__format->format_label, "UYVY") == 0) {
- strncpy(_format_name, __format->format_label, sizeof(GST_VIDEO_FORMATS_ALL)-1);
+ SAFE_STRCPY(_format_name, __format->format_label, sizeof(_format_name));
} else if (strcmp(__format->format_label, "YUYV") == 0) {
- strncpy(_format_name, "YVYU", sizeof(GST_VIDEO_FORMATS_ALL)-1);
+ SAFE_STRCPY(_format_name, "YVYU", sizeof(_format_name));
}
gstcs_debug("Chosen video format: %s", _format_name);
__format->caps = gst_caps_new_simple("video/x-raw",
@@ -307,9 +309,9 @@ _mm_set_image_output_format_s_capabilities(image_format_s* __format) /*_format_l
|| strcmp(__format->format_label, "YV12") == 0
|| strcmp(__format->format_label, "NV12") == 0
|| strcmp(__format->format_label, "UYVY") == 0) {
- strncpy(_format_name, __format->format_label, sizeof(GST_VIDEO_FORMATS_ALL)-1);
+ SAFE_STRCPY(_format_name, __format->format_label, sizeof(_format_name));
} else if (strcmp(__format->format_label, "YUYV") == 0) {
- strncpy(_format_name, "YVYU", sizeof(GST_VIDEO_FORMATS_ALL)-1);
+ SAFE_STRCPY(_format_name, "YVYU", sizeof(_format_name));
}
gstcs_debug("Chosen video format: %s", _format_name);
__format->caps = gst_caps_new_simple("video/x-raw",
@@ -389,13 +391,13 @@ _mm_set_image_colorspace(image_format_s* __format)
memset(__format->colorspace, 0, IMAGE_FORMAT_LABEL_BUFFER_SIZE);
if ((strcmp(__format->format_label, "I420") == 0) || (strcmp(__format->format_label, "Y42B") == 0) || (strcmp(__format->format_label, "Y444") == 0)
|| (strcmp(__format->format_label, "YV12") == 0) || (strcmp(__format->format_label, "NV12") == 0) || (strcmp(__format->format_label, "UYVY") == 0) || (strcmp(__format->format_label, "YUYV") == 0)) {
- strncpy(__format->colorspace, "YUV", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
+ SAFE_STRCPY(__format->colorspace, "YUV", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
} else if ((strcmp(__format->format_label, "RGB888") == 0) || (strcmp(__format->format_label, "BGR888") == 0) || (strcmp(__format->format_label, "RGB565") == 0)) {
- strncpy(__format->colorspace, "RGB", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
+ SAFE_STRCPY(__format->colorspace, "RGB", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
} else if ((strcmp(__format->format_label, "ARGB8888") == 0) || (strcmp(__format->format_label, "BGRA8888") == 0) || (strcmp(__format->format_label, "RGBA8888") == 0) || (strcmp(__format->format_label, "ABGR8888") == 0)) {
- strncpy(__format->colorspace, "RGBA", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
+ SAFE_STRCPY(__format->colorspace, "RGBA", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
} else if ((strcmp(__format->format_label, "BGRX") == 0)) {
- strncpy(__format->colorspace, "BGRX", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
+ SAFE_STRCPY(__format->colorspace, "BGRX", IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
} else {
gstcs_error("Check your colorspace format label");
GSTCS_FREE(__format->colorspace);
@@ -468,7 +470,7 @@ _mm_set_input_image_format_s_struct(imgp_info_s* pImgp_info) /* char* __format_l
return NULL;
}
memset(__format->format_label, 0, IMAGE_FORMAT_LABEL_BUFFER_SIZE);
- strncpy(__format->format_label, pImgp_info->input_format_label, strlen(pImgp_info->input_format_label));
+ SAFE_STRCPY(__format->format_label, pImgp_info->input_format_label, IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
gstcs_debug("input_format_label: %s\n", pImgp_info->input_format_label);
_mm_set_image_colorspace(__format);
@@ -523,7 +525,7 @@ _mm_set_output_image_format_s_struct(imgp_info_s* pImgp_info, const image_format
return NULL;
}
memset(__format->format_label, 0, IMAGE_FORMAT_LABEL_BUFFER_SIZE);
- strncpy(__format->format_label, pImgp_info->output_format_label, strlen(pImgp_info->output_format_label));
+ SAFE_STRCPY(__format->format_label, pImgp_info->output_format_label, IMAGE_FORMAT_LABEL_BUFFER_SIZE-1);
_mm_set_image_colorspace(__format);
__format->width = pImgp_info->dst_width;
@@ -606,6 +608,7 @@ _mm_push_buffer_into_pipeline_new(image_format_s *input_format, image_format_s *
if (gst_buf == NULL) {
gstcs_error("buffer is NULL\n");
+ GSTCS_FREE(data);
return GSTCS_ERROR_INVALID_PARAMETER;
}