From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Fri, 27 Dec 2019 04:55:04 +0000 (+0900)
Subject: [0.3.125] Fix build error due to toolchain upgrade (gcc6 ->gcc9)
X-Git-Tag: submit/tizen/20200107.042723^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48e2020962ee398462c1591ce996978223f98895;p=platform%2Fcore%2Fapi%2Fplayer.git

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

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

Change-Id: I8d2d9fc80f727054a79fe455808ab8619073c348
---

diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 57940a3..046e8c5 100644
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.124
+Version:    0.3.125
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/test/player_audio_test.c b/test/player_audio_test.c
index ecf1481..1dea843 100644
--- a/test/player_audio_test.c
+++ b/test/player_audio_test.c
@@ -219,9 +219,13 @@ static int _save(unsigned char *src, int length)
 
 static void input_filename(char *filename)
 {
-	int len = strlen(filename);
+	int len = 0;
 	int i = 0;
 
+	if (!filename)
+		return;
+
+	len = strlen(filename);
 	if (len < 0 || len > MAX_STRING_LEN - 1)
 		return;
 
@@ -235,7 +239,8 @@ static void input_filename(char *filename)
 		if (player_create(&g_player[i]) != PLAYER_ERROR_NONE)
 			g_print("player create is failed\n");
 	}
-	strncpy(g_uri, filename, len + 1);
+
+	g_strlcpy(g_uri, filename, MAX_STRING_LEN);
 
 #if 0
 	/* ned(APPSRC_TEST) */
diff --git a/test/player_test.c b/test/player_test.c
index 1975c01..a3b9ae3 100644
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -700,9 +700,13 @@ static void reset_display()
 #endif
 static void input_filename(char *filename)
 {
-	int len = strlen(filename);
+	int len = 0;
 	int i = 0;
 
+	if (!filename)
+		return;
+
+	len = strlen(filename);
 	if (len < 0 || len > MAX_STRING_LEN - 1)
 		return;
 
@@ -717,8 +721,7 @@ static void input_filename(char *filename)
 			g_print("player create is failed\n");
 	}
 
-	strncpy(g_uri, filename, len+1);
-	g_uri[len] = '\0';
+	g_strlcpy(g_uri, filename, MAX_STRING_LEN);
 
 #if 0
 	/* ned(APPSRC_TEST) */
@@ -1915,10 +1918,10 @@ static void input_subtitle_filename(char *subtitle_filename)
 {
 	int len = strlen(subtitle_filename);
 
-	if (len < 1 || len > MAX_STRING_LEN)
+	if (len < 1 || len > MAX_STRING_LEN - 1)
 		return;
 
-	strncpy(g_subtitle_uri, subtitle_filename, len);
+	g_strlcpy(g_subtitle_uri, subtitle_filename, MAX_STRING_LEN);
 	g_print("subtitle uri is set to %s\n", g_subtitle_uri);
 	player_set_subtitle_path(g_player[0], g_subtitle_uri);
 	player_set_subtitle_updated_cb(g_player[0], subtitle_updated_cb, (void *)g_player[0]);