From 8e726d3b7149fc0a32ab69d9a6818dc6d5a5ff47 Mon Sep 17 00:00:00 2001 From: Gilbok Lee Date: Tue, 12 Sep 2017 20:32:31 +0900 Subject: [PATCH] Fix Svace issues [Version] 0.1.11 [Profile] Mobile, TV [Issue Type] Fix Svace issues Change-Id: Iaa507dc1163af26a344cd27db2b4dfc9a14d9f3c --- include/video_util_type.h | 2 +- packaging/capi-media-video-util.spec | 2 +- src/video_util.c | 11 ++++++++--- test/video_util_test.c | 6 ++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/video_util_type.h b/include/video_util_type.h index 3ee1c8c..84ff3c6 100755 --- a/include/video_util_type.h +++ b/include/video_util_type.h @@ -85,7 +85,7 @@ typedef enum { typedef enum { VIDEO_UTIL_FILE_FORMAT_3GP = 0, /**< 3GP */ VIDEO_UTIL_FILE_FORMAT_MP4, /**< MP4 */ - VIDEO_UTIL_FILE_FORMAT_MAX /**< MAX */ + VIDEO_UTIL_FILE_FORMAT_MAX } video_util_file_format_e; /** diff --git a/packaging/capi-media-video-util.spec b/packaging/capi-media-video-util.spec index 01a2d73..53359a7 100755 --- a/packaging/capi-media-video-util.spec +++ b/packaging/capi-media-video-util.spec @@ -1,6 +1,6 @@ Name: capi-media-video-util Summary: A Video Utility library in Tizen Native API -Version: 0.1.10 +Version: 0.1.11 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/video_util.c b/src/video_util.c index 4828c13..425979f 100755 --- a/src/video_util.c +++ b/src/video_util.c @@ -141,7 +141,7 @@ int __video_util_check_transcode_is_busy(video_util_s *handle, bool *is_busy) static bool __video_util_check_video_codec(video_util_video_codec_e video_codec) { - if ((video_codec < 0) || (video_codec > VIDEO_UTIL_VIDEO_CODEC_NONE)) { + if (video_codec > VIDEO_UTIL_VIDEO_CODEC_NONE) { video_util_error("invalid video_codec [%d]", video_codec); return false; } @@ -151,7 +151,7 @@ static bool __video_util_check_video_codec(video_util_video_codec_e video_codec) static bool __video_util_check_audio_codec(video_util_audio_codec_e audio_codec) { - if ((audio_codec < 0) || (audio_codec > VIDEO_UTIL_AUDIO_CODEC_NONE)) { + if (audio_codec > VIDEO_UTIL_AUDIO_CODEC_NONE) { video_util_error("invalid audio_codec [%d]", audio_codec); return false; } @@ -161,7 +161,7 @@ static bool __video_util_check_audio_codec(video_util_audio_codec_e audio_codec) static bool __video_util_check_file_format(video_util_file_format_e file_format) { - if ((file_format < 0) || (file_format >= VIDEO_UTIL_FILE_FORMAT_MAX)) { + if (file_format >= VIDEO_UTIL_FILE_FORMAT_MAX) { video_util_error("invalid file_format [%d]", file_format); return false; } @@ -269,6 +269,11 @@ static int __video_util_foreach_supported_type(video_util_type_e type, video_uti int ret = VIDEO_UTIL_ERROR_NONE; video_util_type_cb_s *codec_cb = (video_util_type_cb_s *)calloc(1, sizeof(video_util_type_cb_s)); + if (!codec_cb) { + video_util_error("Fail to allocate internal callback"); + return VIDEO_UTIL_ERROR_OUT_OF_MEMORY; + } + codec_cb->user_data = user_data; codec_cb->supported_type_cb = (video_util_supported_type_cb)callback; diff --git a/test/video_util_test.c b/test/video_util_test.c index 97f7a73..388a8b4 100644 --- a/test/video_util_test.c +++ b/test/video_util_test.c @@ -293,8 +293,8 @@ static void input_filename(char *filename) return; } - strncpy(g_uri, filename, len); - g_uri[len] = '\0'; + strncpy(g_uri, filename, sizeof(g_uri) - 1); + g_uri[sizeof(g_uri) - 1] = '\0'; ret = video_util_set_file_path(video_h, g_uri); @@ -409,8 +409,6 @@ static void displaymenu(void) g_print("*** input video resolution.(width, height)\n"); } else if (g_menu_state == CURRENT_STATUS_SET_FPS) { g_print("*** input video fps.(5<=fps<=30)\n"); - } else if (g_menu_state == CURRENT_STATUS_SET_FPS) { - g_print("*** input video fps.(5<=fps<=30)\n"); } else if (g_menu_state == CURRENT_STATUS_SET_TIME) { g_print("*** input transcode start/duration time(ms), run nth.(start time, duration, n)\n"); } else if (g_menu_state == CURRENT_STATUS_SET_OUTFILENAME) { -- 2.7.4