Replace sqlite3_free() to SQLITE3_SAFE_FREE

Change-Id: I0296bb2119146e1ee26334f04d0ec52052dbd19a

diff --git a/src/common/media-svc-album.c b/src/common/media-svc-album.c
index 7dbf8dc..7c588f0 100755 (executable)
--- a/src/common/media-svc-album.c
+++ b/src/common/media-svc-album.c
@@ -100,7 +100,7 @@ int _media_svc_append_album(sqlite3 *handle, const char *album, const char *arti
        char *sql = sqlite3_mprintf("INSERT INTO %s (name, artist, album_art, album_art) values (%Q, %Q, %Q, %Q); ",
                                MEDIA_SVC_DB_TABLE_ALBUM, album, artist, album_art, album_art);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /**album_id = sqlite3_last_insert_rowid(handle); */

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index 8492a97..1fdff8d 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -147,12 +147,12 @@ static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
        /*drop playlist_view, tag_view */
        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_DROP_VIEW, MEDIA_SVC_DB_VIEW_PLAYLIST);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_DROP_VIEW, MEDIA_SVC_DB_VIEW_TAG);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*create playlist_view */
@@ -198,7 +198,7 @@ static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
        }
        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_VIEW_PLAYLIST, MEDIA_SVC_DB_VIEW_PLAYLIST, table_query);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        /*create tag_view */
@@ -244,7 +244,7 @@ static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
        }
        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_VIEW_TAG, MEDIA_SVC_DB_VIEW_TAG, table_query);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        return MS_MEDIA_ERR_NONE;
@@ -356,14 +356,14 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
        if (table_sub_len > 0) {
                sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_TABLE_WITH_UNIQUE, table_name, table_query, table_query_sub);
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                memset(table_query, 0, sizeof(table_query));
                memset(table_query_sub, 0, sizeof(table_query_sub));
                media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        } else {
                sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_TABLE, table_name, table_query);
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                memset(table_query, 0, sizeof(table_query));
                media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        }
@@ -386,7 +386,7 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
                if (strncmp(table_name, MEDIA_SVC_DB_TABLE_MEDIA, strlen(MEDIA_SVC_DB_TABLE_MEDIA)) == 0) {
                        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_VIEW_MEDIA, tb->view_name, table_name);
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
                } else if (strncmp(table_name, MEDIA_SVC_DB_TABLE_PLAYLIST, strlen(MEDIA_SVC_DB_TABLE_PLAYLIST)) == 0) {
@@ -432,7 +432,7 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
                        }
                        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_VIEW_PLAYLIST, tb->view_name, table_query);
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
                } else {
@@ -475,7 +475,7 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
                        }
                        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_VIEW_TAG, tb->view_name, table_query);
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
                }
@@ -517,7 +517,7 @@ int _media_svc_upgrade_table_query(sqlite3 *db_handle, const char *table_name, m
                                snprintf(temp, sizeof(temp), "%s %s", col_ptr->name, col_ptr->type);
                        sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_ALTER_TABLE, table_name, temp);
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
                        /*create index */
                        if (col_ptr->is_index) {
@@ -1607,7 +1607,7 @@ int _media_svc_drop_media_table(const char *storage_id, uid_t uid)
        char *sql = sqlite3_mprintf("DROP TABLE IF EXISTS '%q'", storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index 1d79cea..4d4a06f 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -176,7 +176,7 @@ int _media_svc_get_folder_id_by_foldername(sqlite3 *handle, const char *storage_
                        else
                                sql = sqlite3_mprintf("UPDATE %q SET parent_folder_uuid = '%q' WHERE path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, parent_folder_uuid, folder_name);
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                } else {
                        media_svc_error("error when get parent folder uuid");
                }
@@ -207,7 +207,7 @@ static int __media_svc_append_folder(const char *storage_id, media_svc_storage_t
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
        } else {
                _media_svc_sql_query_add(&g_media_svc_insert_folder_query_list, &sql);
        }
@@ -229,7 +229,7 @@ int _media_svc_update_folder_modified_time_by_folder_uuid(const char *folder_uui
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
        } else {
                _media_svc_sql_query_add(&g_media_svc_move_item_query_list, &sql);
        }
@@ -355,7 +355,7 @@ int _media_svc_update_folder_table(const char *storage_id, uid_t uid)
                MEDIA_SVC_DB_TABLE_FOLDER, MEDIA_SVC_DB_TABLE_FOLDER, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -578,7 +578,7 @@ int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const ch
 
                if (!stack_query) {
                        ret = _media_svc_sql_query(sql, uid);
-                       sqlite3_free(sql);
+                       SQLITE3_SAFE_FREE(sql);
                } else {
                        _media_svc_sql_query_add(&g_media_svc_insert_folder_query_list, &sql);
                }
@@ -597,7 +597,7 @@ int _media_svc_delete_invalid_folder(const char *storage_id, int storage_type, u
        sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid = '%q' AND storage_type = %d AND validity = 0;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type);
        ret = _media_svc_sql_query(sql, uid);
 
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -622,7 +622,7 @@ int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, cons
 
        ret = _media_svc_sql_query(sql, uid);
 
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -635,7 +635,7 @@ int _media_svc_delete_folder_by_storage_id(const char *storage_id, media_svc_sto
        sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid = '%q' AND storage_type = %d;", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, storage_type);
        ret = _media_svc_sql_query(sql, uid);
 
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -681,7 +681,7 @@ int _media_svc_set_folder_scan_status(const char *storage_id, const char *path,
                sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE storage_uuid = '%q'", MEDIA_SVC_DB_TABLE_FOLDER, scan_status, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -860,7 +860,7 @@ int _media_svc_delete_invalid_folder_by_path(sqlite3 *handle, const char *storag
        sql = sqlite3_mprintf("DELETE FROM '%s' WHERE (storage_uuid = '%q' AND validity = 0 AND PATH LIKE '%q%%');", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_path);
        ret = _media_svc_sql_query(sql, uid);
 
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        *delete_count = del_count;
 

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 51cc2a6..ecbf711 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -209,7 +209,7 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
        char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
-       sqlite3_free(test_sql);
+       SQLITE3_SAFE_FREE(test_sql);
 
        if (is_burst) {
                int burst_id_int = 0;
@@ -368,14 +368,11 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
                                                );
        }
 
-       if (burst_id) {
-               sqlite3_free(burst_id);
-               burst_id = NULL;
-       }
+       SQLITE3_SAFE_FREE(burst_id);
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                if (ret != MS_MEDIA_ERR_NONE) {
                        media_svc_error("failed to insert item");
                        return ret;
@@ -395,7 +392,7 @@ int _media_svc_update_meta_with_data(media_svc_content_info_s *content_info)
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
        char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
-       sqlite3_free(test_sql);
+       SQLITE3_SAFE_FREE(test_sql);
 
        /*Update Pinyin If Support Pinyin*/
        if (_media_svc_check_pinyin_support()) {
@@ -461,7 +458,7 @@ int _media_svc_update_item_with_data(const char *storage_id, media_svc_content_i
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
        char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
-       sqlite3_free(test_sql);
+       SQLITE3_SAFE_FREE(test_sql);
 
        /*Update Pinyin If Support Pinyin*/
        if (_media_svc_check_pinyin_support()) {
@@ -524,7 +521,7 @@ int _media_svc_update_item_with_data(const char *storage_id, media_svc_content_i
                                );
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -581,7 +578,7 @@ int _media_svc_delete_item_by_path(const char *storage_id, const char *path, boo
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                if (ret != MS_MEDIA_ERR_NONE) {
                        media_svc_error("failed to delete item");
                        return ret;
@@ -601,7 +598,7 @@ int _media_svc_truncate_table(const char *storage_id, media_svc_storage_type_e s
        char *sql = sqlite3_mprintf("DELETE FROM '%s' where storage_type=%d;", storage_id, storage_type);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -638,7 +635,7 @@ int _media_svc_delete_invalid_items(sqlite3 *handle, const char *storage_id, med
        char *sql = sqlite3_mprintf("DELETE FROM '%s' WHERE validity = 0;", storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                SAFE_FREE(thumbpath_record);
                return ret;
@@ -701,7 +698,7 @@ int _media_svc_delete_invalid_folder_items(sqlite3 *handle, const char *storage_
                sql = sqlite3_mprintf("DELETE FROM '%s' WHERE validity = 0 AND folder_uuid='%q';", storage_id, folder_uuid);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                SAFE_FREE(thumbpath_record);
                return ret;
@@ -735,7 +732,7 @@ int _media_svc_update_item_validity(const char *storage_id, const char *path, in
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
        } else {
                _media_svc_sql_query_add(&g_media_svc_item_validity_query_list, &sql);
        }
@@ -750,7 +747,7 @@ int _media_svc_update_thumbnail_path(const char *storage_id, const char *path, c
        char *sql = sqlite3_mprintf("UPDATE '%s' SET thumbnail_path=%Q WHERE path= %Q;", storage_id, thumb_path, path);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -762,7 +759,7 @@ int _media_svc_update_storage_item_validity(const char *storage_id, media_svc_st
        char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_type=%d;", storage_id, validity, storage_type);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -794,7 +791,7 @@ int _media_svc_update_folder_item_validity(sqlite3 *handle, const char *storage_
        sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE folder_uuid='%q';", storage_id, validity, folder_uuid);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -807,7 +804,7 @@ int _media_svc_update_recursive_folder_item_validity(const char *storage_id, con
        char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE (storage_type = 0 OR storage_type = 1) AND path LIKE '%q/%%';", storage_id, validity, folder_path);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -833,7 +830,7 @@ int _media_svc_update_item_by_path(const char *storage_id, const char *src_path,
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
        } else {
                _media_svc_sql_query_add(&g_media_svc_move_item_query_list, &sql);
        }
@@ -1041,7 +1038,7 @@ int _media_svc_change_validity_item_batch(const char *storage_id, const char *pa
        char *sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE validity=%d AND path LIKE '%q%%'", storage_id, des_validity, src_validity, path);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -1071,16 +1068,13 @@ int _media_svc_insert_item_pass1(sqlite3 *handle, const char *storage_id, media_
                storage_id
                );
 #if 0
-       if (burst_id) {
-               sqlite3_free(burst_id);
-               burst_id = NULL;
-       }
+               SQLITE3_SAFE_FREE(burst_id);
 #endif
        media_svc_debug("MAKE PASS 1 QUERY END");
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                if (ret != MS_MEDIA_ERR_NONE) {
                        media_svc_error("failed to insert item");
                        return ret;
@@ -1175,7 +1169,7 @@ int _media_svc_insert_item_pass2(const char *storage_id, media_svc_content_info_
 
        if (!stack_query) {
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                if (ret != MS_MEDIA_ERR_NONE) {
 
                        media_svc_error("failed to insert item");

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index 92692a9..f9965da 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -47,7 +47,7 @@ int _media_svc_init_storage(sqlite3 *handle, uid_t uid)
                                                MEDIA_SVC_DB_TABLE_STORAGE, MEDIA_SVC_DB_TABLE_MEDIA, MEDIA_SVC_DB_TABLE_MEDIA, internal_path);
 
                ret = _media_svc_sql_query(sql, uid);
-               sqlite3_free(sql);
+               SQLITE3_SAFE_FREE(sql);
                SAFE_FREE(internal_path);
                media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        }
@@ -142,7 +142,7 @@ int _media_svc_append_storage(const char *storage_id, const char *storage_name,
                                                MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name, storage_path, storage_account, storage_type);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -161,7 +161,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        /*Storage table update*/
        sql = sqlite3_mprintf("UPDATE '%s' SET storage_path=%Q WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, path, storage_id);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                G_SAFE_FREE(old_storage_path);
                return ret;
@@ -170,7 +170,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        /*Folder table update*/
        sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {
                G_SAFE_FREE(old_storage_path);
                return ret;
@@ -179,7 +179,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        /*Media table update*/
        sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q);", storage_id, old_storage_path, path);
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
        G_SAFE_FREE(old_storage_path);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
@@ -197,7 +197,7 @@ int _media_svc_delete_storage(const char *storage_id, const char *storage_name,
                sql = sqlite3_mprintf("DELETE FROM '%s' WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -213,7 +213,7 @@ int _media_svc_update_storage_validity(const char *storage_id, int validity, uid
                sql = sqlite3_mprintf("UPDATE '%s' SET validity=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, validity, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }
@@ -366,7 +366,7 @@ int _media_svc_set_storage_scan_status(const char *storage_id, media_svc_scan_st
                sql = sqlite3_mprintf("UPDATE '%s' SET scan_status=%d WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, scan_status, storage_id);
 
        ret = _media_svc_sql_query(sql, uid);
-       sqlite3_free(sql);
+       SQLITE3_SAFE_FREE(sql);
 
        return ret;
 }

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index 995932e..6bbc43e 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1011,7 +1011,7 @@ int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, cons
        update_folder_modified_time_sql = sqlite3_mprintf("UPDATE folder SET modified_time = %d WHERE path LIKE '%q';", date, dst_path);
 
        ret = media_db_request_update_db_batch(update_folder_modified_time_sql, uid);
-       sqlite3_free(update_folder_modified_time_sql);
+       SQLITE3_SAFE_FREE(update_folder_modified_time_sql);
 
        if (ret != SQLITE_OK) {
                media_svc_error("failed to update folder modified time");
@@ -1132,7 +1132,7 @@ int media_svc_rename_folder(MediaSvcHandle *handle, const char *storage_id, cons
                }
 
                ret = media_db_request_update_db_batch(update_item_sql, uid);
-               sqlite3_free(update_item_sql);
+               SQLITE3_SAFE_FREE(update_item_sql);
                SAFE_FREE(replaced_path);
 
                if (ret != SQLITE_OK) {