From: hj kim <backto.kim@samsung.com>
Date: Tue, 30 Apr 2019 08:17:12 +0000 (+0900)
Subject: Bug fix of set icon. icon can be NULL
X-Git-Tag: submit/tizen_5.0/20190502.010438^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e053a1cebcd5b3bee85d1d0b1dc57a247df3e36;p=platform%2Fcore%2Fapi%2Fmedia-controller.git

Bug fix of set icon. icon can be NULL

Change-Id: I94e627ebd04767b62e8f57973ac91dbb3afc1319
(cherry picked from commit 7f81933cd3ac3a2de1c1bde25020e1ec51c85ac9)
---

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index 93f72cf..a60de1a 100644
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -365,15 +365,18 @@ int mc_db_update_repeat_mode(const char *server_name, int repeat_mode)
 int mc_db_update_icon_uri(const char *server_name, const char *uri)
 {
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
+	char *_query = NULL;
 	char *sql_str = NULL;
 
 	mc_retvm_if(!server_name, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-	mc_retvm_if(!uri, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid uri");
 
-	sql_str = g_strdup_printf("%s%s%s%s%s", MC_DB_CMD_UPDATE_ICON, MC_STRING_DELIMITER, server_name,  MC_STRING_DELIMITER, uri);
+	_query = sqlite3_mprintf("UPDATE '%q' SET icon_uri=%Q;", server_name, uri);
+
+	sql_str = g_strdup_printf("%s%s%s", MC_DB_CMD_UPDATE_ICON, MC_STRING_DELIMITER, _query);
 
 	ret = __mc_db_update_db(MC_PRIV_TYPE_SERVER, sql_str);
 
+	SQLITE3_SAFE_FREE(_query);
 	MC_SAFE_FREE(sql_str);
 
 	return ret;
diff --git a/svc/media_controller_db_util.c b/svc/media_controller_db_util.c
index 00609bd..734d8d4 100755
--- a/svc/media_controller_db_util.c
+++ b/svc/media_controller_db_util.c
@@ -679,13 +679,8 @@ int mc_db_parse_and_update_db(uid_t uid, const char *data, int data_size)
 		is_query_from_client = TRUE;
 
 	} else if (strncmp(MC_DB_CMD_UPDATE_ICON, params[0], strlen(MC_DB_CMD_UPDATE_ICON)) == 0) {
-		if (params[2] == NULL) {
-			mc_error("wrong query");
-			ret = MEDIA_CONTROLLER_ERROR_INVALID_OPERATION;
-			goto ERROR;
-		}
-
-		sql_str = sqlite3_mprintf("UPDATE '%q' SET icon_uri=%Q;", params[1], params[2]);
+		sql_str = params[1];
+		is_query_from_client = TRUE;
 
 	} else if (strncmp(MC_DB_CMD_UPDATE_ABILITY, params[0], strlen(MC_DB_CMD_UPDATE_ABILITY)) == 0) {
 		if (params[2] == NULL || params[3] == NULL) {