Fix build error due to toolchain upgrade (gcc6 -> gcc9)

: -Werror=format-truncation, -Werror=stringop-overflow

[Version] 0.6.8
[Profile] Common
[Issue Type] Toolchain

Change-Id: I4eca3d98c4aec29e9c4dc0ba0369052fee923249
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/include/media_codec_ini.h b/include/media_codec_ini.h
index ba0704f..ee05257 100644 (file)
--- a/include/media_codec_ini.h
+++ b/include/media_codec_ini.h
@@ -28,6 +28,7 @@ extern "C" {
 
 #define MEDIA_CODEC_INI_DEFAULT_PATH   SYSCONFDIR"/multimedia/mmfw_media_codec.ini"
 #define MEDIA_CODEC_INI_MAX_STRLEN     256
+#define MEDIA_CODEC_INI_CNAME_LEN      16
 #define DEFAULT_PORT "GST_PORT"
 #define MEDIA_CODEC_MAX_CODEC_TYPE 100
 #define MEDIA_CODEC_MAX_CODEC_ROLE 4
@@ -42,7 +43,7 @@ typedef struct _codec_t codec_t;
 typedef struct _mc_ini_t mc_ini_t;
 
 struct _codec_list_t {
-       gchar cname[MEDIA_CODEC_INI_MAX_STRLEN];
+       gchar cname[MEDIA_CODEC_INI_CNAME_LEN];
        mediacodec_codec_type_e ctype;
 };
 

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 9c4c6c9..2fe5507 100644 (file)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -4,7 +4,7 @@
 
 Name:       capi-media-codec
 Summary:    A Media Codec library in Tizen Native API
-Version:    0.6.7
+Version:    0.6.8
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_codec.c b/src/media_codec.c
index 4149d9b..be2435e 100644 (file)
--- a/src/media_codec.c
+++ b/src/media_codec.c
@@ -349,9 +349,9 @@ int mediacodec_prepare(mediacodec_h mediacodec)
                                MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_ENCODER :
                                MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_DECODER,
                                1, &resource);
-               if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE)
-                       switch (rm_ret) {
+               if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
                        LOGE("Failed to acquire resource manager %x", rm_ret);
+                       switch (rm_ret) {
                        case MM_RESOURCE_MANAGER_ERROR_NOT_SUPPORTED:
                                return MEDIACODEC_ERROR_NOT_SUPPORTED_ON_DEVICE;
                        case MM_RESOURCE_MANAGER_ERROR_NOT_ENOUGH:
@@ -359,6 +359,7 @@ int mediacodec_prepare(mediacodec_h mediacodec)
                        default:
                                return MEDIACODEC_ERROR_INTERNAL;
                        }
+               }
 
                rm_ret = mm_resource_manager_commit(g_mc_resource_manager);
                if (rm_ret != MM_RESOURCE_MANAGER_ERROR_NONE) {

diff --git a/src/media_codec_ini.c b/src/media_codec_ini.c
index b9d4d14..4a51222 100644 (file)
--- a/src/media_codec_ini.c
+++ b/src/media_codec_ini.c
@@ -88,9 +88,9 @@ do {\
        if (str &&  \
                        (strlen(str) > 0) && \
                        (strlen(str) < MEDIA_CODEC_INI_MAX_STRLEN)) \
-               strncpy(x_item, str, strlen(str) + 1); \
+               strncpy(x_item, str, MEDIA_CODEC_INI_MAX_STRLEN - 1); \
        else \
-               strncpy(x_item, x_default, strlen(x_default) + 1); \
+               strncpy(x_item, x_default, MEDIA_CODEC_INI_MAX_STRLEN - 1); \
 } while (0)
 
 #define MEDIA_CODEC_INI_GET_STRING_FROM_LIST(x_dict, x_list, x_ini, x_default) \