From aec47cdda3c4369b876f46d794885c0dc4160bf4 Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 11 Apr 2024 08:52:56 +0900 Subject: [PATCH] Modify to use sqlite3_free in each functions Change-Id: I14ab999688df41601c2d0f04eaecbd815a46b6a9 Signed-off-by: Minje Ahn --- packaging/libmedia-service.spec | 2 +- src/media-svc-album.c | 1 + src/media-svc-db-utils.c | 58 ++++++++++++----------------------------- src/media-svc-media-folder.c | 6 ++--- src/media-svc-media.c | 5 +++- src/media-svc-storage.c | 5 ++-- src/media-svc.c | 5 +--- 7 files changed, 30 insertions(+), 52 deletions(-) diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec index 4066971..73048f5 100644 --- a/packaging/libmedia-service.spec +++ b/packaging/libmedia-service.spec @@ -1,6 +1,6 @@ Name: libmedia-service Summary: Media information service library for multimedia applications -Version: 0.6.0 +Version: 0.6.1 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/media-svc-album.c b/src/media-svc-album.c index c32f44c..511900b 100755 --- a/src/media-svc-album.c +++ b/src/media-svc-album.c @@ -34,6 +34,7 @@ int _media_svc_get_album_id(sqlite3 *handle, const char *album, const char *arti sql = sqlite3_mprintf("SELECT album_id FROM %s WHERE name=%Q AND artist=%Q", DB_TABLE_ALBUM, album, artist); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); if (ret != MS_MEDIA_ERR_NONE) { if (ret == MS_MEDIA_ERR_DB_NO_RECORD) media_svc_debug("there is no album."); diff --git a/src/media-svc-db-utils.c b/src/media-svc-db-utils.c index e40c9fb..9df0f92 100755 --- a/src/media-svc-db-utils.c +++ b/src/media-svc-db-utils.c @@ -537,11 +537,10 @@ int _media_svc_check_table_exist(sqlite3 *db_handle, bool *exist) { int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = sqlite3_mprintf("SELECT name FROM sqlite_master WHERE type='table' AND name=%Q;", DB_TABLE_MEDIA); + const char *sql = "SELECT name FROM sqlite_master WHERE type='table' AND name='media';"; ret = _media_svc_sql_prepare_to_step_simple(db_handle, sql, &sql_stmt); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_sql_prepare_to_step_simple failed"); - if (sqlite3_step(sql_stmt) != SQLITE_ROW) { media_svc_debug("Need to create table"); *exist = false; @@ -555,23 +554,16 @@ int _media_svc_check_table_exist(sqlite3 *db_handle, bool *exist) return MS_MEDIA_ERR_NONE; } -int _media_svc_sql_prepare_to_step(sqlite3 *handle, const char *sql_str, sqlite3_stmt **stmt) +static int __media_svc_sql_prepare_base(sqlite3 *handle, const char *sql_str, sqlite3_stmt **stmt, bool use_step) { - int err = -1; + int err = SQLITE_OK; - media_svc_retvm_if(sql_str == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid query"); - - if (handle == NULL) { - media_svc_error("handle is NULL"); - sqlite3_free((char *)sql_str); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } + media_svc_retvm_if(!handle, MS_MEDIA_ERR_INVALID_PARAMETER, "handle is NULL"); + media_svc_retvm_if(!STRING_VALID(sql_str), MS_MEDIA_ERR_INVALID_PARAMETER, "invalid query"); media_svc_sec_debug("Query[%s]", sql_str); err = sqlite3_prepare_v2(handle, sql_str, -1, stmt, NULL); - sqlite3_free((char *)sql_str); - if (err != SQLITE_OK) { media_svc_error("prepare error %d[%s]", err, sqlite3_errmsg(handle)); if (err == SQLITE_CORRUPT) @@ -580,41 +572,25 @@ int _media_svc_sql_prepare_to_step(sqlite3 *handle, const char *sql_str, sqlite3 return MS_MEDIA_ERR_DB_INTERNAL; } - err = sqlite3_step(*stmt); - if (err != SQLITE_ROW) { - media_svc_debug("No record"); - SQLITE3_FINALIZE(*stmt); - return MS_MEDIA_ERR_DB_NO_RECORD; + if (use_step) { + if (sqlite3_step(*stmt) != SQLITE_ROW) { + media_svc_debug("No record"); + SQLITE3_FINALIZE(*stmt); + return MS_MEDIA_ERR_DB_NO_RECORD; + } } return MS_MEDIA_ERR_NONE; } -int _media_svc_sql_prepare_to_step_simple(sqlite3 *handle, const char *sql_str, sqlite3_stmt **stmt) +int _media_svc_sql_prepare_to_step(sqlite3 *handle, const char *sql_str, sqlite3_stmt **stmt) { - int err = -1; - - media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "handle is NULL"); - - media_svc_sec_debug("Query[%s]", sql_str); - - if (!STRING_VALID(sql_str)) { - media_svc_error("invalid query"); - return MS_MEDIA_ERR_INVALID_PARAMETER; - } - - err = sqlite3_prepare_v2(handle, sql_str, -1, stmt, NULL); - sqlite3_free((char *)sql_str); - - if (err != SQLITE_OK) { - media_svc_error("prepare error %d[%s]", err, sqlite3_errmsg(handle)); - if (err == SQLITE_CORRUPT) - return MS_MEDIA_ERR_DB_CORRUPT; - - return MS_MEDIA_ERR_DB_INTERNAL; - } + return __media_svc_sql_prepare_base(handle, sql_str, stmt, true); +} - return MS_MEDIA_ERR_NONE; +int _media_svc_sql_prepare_to_step_simple(sqlite3 *handle, const char *sql_str, sqlite3_stmt **stmt) +{ + return __media_svc_sql_prepare_base(handle, sql_str, stmt, false); } int _media_svc_sql_query_list(GList **query_list, uid_t uid) diff --git a/src/media-svc-media-folder.c b/src/media-svc-media-folder.c index e594cc2..f679826 100755 --- a/src/media-svc-media-folder.c +++ b/src/media-svc-media-folder.c @@ -30,11 +30,10 @@ static int __media_svc_get_folder_id(sqlite3 *handle, const char *path, long lon { int ret = MS_MEDIA_ERR_NONE; sqlite3_stmt *sql_stmt = NULL; - char *sql = NULL; - - sql = sqlite3_mprintf("SELECT folder_id FROM %q WHERE folder_path=%Q", DB_TABLE_FOLDER, path); + char *sql = sqlite3_mprintf("SELECT folder_id FROM %q WHERE folder_path=%Q", DB_TABLE_FOLDER, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_sql_prepare_to_step failed [%d]", ret); *folder_id = sqlite3_column_int64(sql_stmt, 0); @@ -184,6 +183,7 @@ int _media_svc_check_folder_by_path(sqlite3 *handle, const char *path) sql = sqlite3_mprintf("SELECT 1 FROM %q WHERE folder_path=%Q", DB_TABLE_FOLDER, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); SQLITE3_FINALIZE(sql_stmt); diff --git a/src/media-svc-media.c b/src/media-svc-media.c index ee7a737..a24bdab 100755 --- a/src/media-svc-media.c +++ b/src/media-svc-media.c @@ -42,6 +42,7 @@ int _media_svc_check_data_by_path(sqlite3 *handle, const char *path) sql = sqlite3_mprintf("SELECT 1 FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); SQLITE3_FINALIZE(sql_stmt); @@ -58,6 +59,7 @@ int _media_svc_get_modified_time(sqlite3 *handle, const char *path, int *modifie sql = sqlite3_mprintf("SELECT media_modified_time FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); *modified_time = sqlite3_column_int(sql_stmt, 0); @@ -166,7 +168,7 @@ int _media_svc_get_thumbnail_path_by_path(sqlite3 *handle, const char *path, cha sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); - + SQLITE3_SAFE_FREE(sql); if (ret != MS_MEDIA_ERR_NONE) { if (ret == MS_MEDIA_ERR_DB_NO_RECORD) media_svc_debug("there is no thumbnail."); @@ -313,6 +315,7 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *path, media_svc_noti_i sql = sqlite3_mprintf("SELECT media_id, media_type, media_mime_type FROM %q WHERE media_path=%Q", DB_TABLE_MEDIA, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_sql_prepare_to_step() failed [%d]", ret); *item = g_new0(media_svc_noti_item, 1); diff --git a/src/media-svc-storage.c b/src/media-svc-storage.c index 062af7e..b3d355f 100755 --- a/src/media-svc-storage.c +++ b/src/media-svc-storage.c @@ -40,6 +40,7 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto sql = sqlite3_mprintf("SELECT storage_path, validity FROM %q WHERE storage_id=%Q", DB_TABLE_STORAGE, storage_id); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); *storage_path = g_strdup((const char *)sqlite3_column_text(sql_stmt, 0)); @@ -100,10 +101,9 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons static int __media_svc_delete_thumbnail(sqlite3 *handle) { int ret = MS_MEDIA_ERR_NONE; - char *sql = NULL; + const char *sql = "SELECT media_thumbnail_path FROM media WHERE validity=0 AND media_thumbnail_path IS NOT NULL;"; sqlite3_stmt *sql_stmt = NULL; - sql = sqlite3_mprintf("SELECT media_thumbnail_path FROM %q WHERE validity=0 AND media_thumbnail_path is not null", DB_TABLE_MEDIA); ret = _media_svc_sql_prepare_to_step_simple(handle, sql, &sql_stmt); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); @@ -171,6 +171,7 @@ int _media_svc_get_storage_uuid(sqlite3 *handle, const char *path, char *storage sql = sqlite3_mprintf("SELECT storage_id FROM %q WHERE validity=1 AND instr(%Q, storage_path)", DB_TABLE_STORAGE, path); ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt); + SQLITE3_SAFE_FREE(sql); media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret); if (STRING_VALID((const char *)sqlite3_column_text(sql_stmt, 0))) diff --git a/src/media-svc.c b/src/media-svc.c index 74a2bb2..61eb839 100755 --- a/src/media-svc.c +++ b/src/media-svc.c @@ -677,15 +677,12 @@ int media_svc_get_book_by_keyword(sqlite3 *handle, const char *keyword, uid_t ui int ret = MS_MEDIA_ERR_NONE; GList *item_list = NULL; GList *iter = NULL; - char *query = NULL; + const char *query = "SELECT media_path FROM media WHERE media_type=5 AND validity=1;"; media_svc_retvm_if(!handle, MS_MEDIA_ERR_INVALID_PARAMETER, "db handle is NULL"); media_svc_retvm_if(!keyword, MS_MEDIA_ERR_INVALID_PARAMETER, "keyword is NULL"); media_svc_retvm_if(!result, MS_MEDIA_ERR_INVALID_PARAMETER, "result is NULL"); - query = sqlite3_mprintf("SELECT media_path FROM %q WHERE media_type=%d AND validity=1;", - DB_TABLE_MEDIA, MEDIA_SVC_MEDIA_TYPE_BOOK); - ret = _media_svc_get_media(handle, query, &item_list); media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_media failed"); -- 2.7.4