replace strdup to g_strdup because g_strdup check input param NULL

Change-Id: Ic6038baac39e330172322aaaa46ab57692e2c97e

diff --git a/src/media_folder.c b/src/media_folder.c
index 87e81f9..f7b4b95 100755 (executable)
--- a/src/media_folder.c
+++ b/src/media_folder.c
@@ -421,14 +421,9 @@ int media_folder_get_folder_from_db(const char *folder_id, media_folder_h *folde
 
                media_content_error("folder handle %x", _folder);
 
-               if(STRING_VALID((const char *)sqlite3_column_text(stmt, 0)))
-                       _folder->folder_id = strdup((const char *)sqlite3_column_text(stmt, 0));
-
-               if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
-                       _folder->path = strdup((const char *)sqlite3_column_text(stmt, 1));
-
-               if(STRING_VALID((const char *)sqlite3_column_text(stmt, 2)))
-                       _folder->name = strdup((const char *)sqlite3_column_text(stmt, 2));
+               _folder->folder_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+               _folder->path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+               _folder->name = g_strdup((const char *)sqlite3_column_text(stmt, 2));
 
                *folder = (media_folder_h)_folder;
        }

diff --git a/src/media_playlist.c b/src/media_playlist.c
index baa43be..e78a6e3 100755 (executable)
--- a/src/media_playlist.c
+++ b/src/media_playlist.c
@@ -592,10 +592,8 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
                        }
 
                        _playlist->playlist_id = (int)sqlite3_column_int(stmt, 0);
-                       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
-                               _playlist->name = strdup((const char *)sqlite3_column_text(stmt, 1));
-                       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 3)))
-                               _playlist->thumbnail_path = strdup((const char *)sqlite3_column_text(stmt, 3));
+                       _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+                       _playlist->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 3));
 
                        *playlist = (media_playlist_h)_playlist;
                }

diff --git a/src/media_storage.c b/src/media_storage.c
index e56b11f..7485d8a 100755 (executable)
--- a/src/media_storage.c
+++ b/src/media_storage.c
@@ -23,18 +23,10 @@ static void __media_storage_get_detail(sqlite3_stmt* stmt, media_storage_h stora
 {
        media_storage_s *_storage = (media_storage_s*)storage;
 
-       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 0)))
-               _storage->storage_id = strdup((const char *)sqlite3_column_text(stmt, 0));
-
-       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
-               _storage->storage_name = strdup((const char *)sqlite3_column_text(stmt, 1));
-
-       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 2)))
-               _storage->storage_path = strdup((const char *)sqlite3_column_text(stmt, 2));
-
-       if(STRING_VALID((const char *)sqlite3_column_text(stmt, 3)))
-               _storage->storage_account = strdup((const char *)sqlite3_column_text(stmt, 3));
-
+       _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+       _storage->storage_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+       _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
+       _storage->storage_account = g_strdup((const char *)sqlite3_column_text(stmt, 3));
        _storage->storage_type = (int)sqlite3_column_int(stmt, 4);
 
        return;

diff --git a/src/media_tag.c b/src/media_tag.c
index 9515ca5..a1ab9d8 100755 (executable)
--- a/src/media_tag.c
+++ b/src/media_tag.c
@@ -113,15 +113,10 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag)
 
        while(sqlite3_step(stmt) == SQLITE_ROW)
        {
-               id = (int)sqlite3_column_int(stmt,0);
-
-               if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
-               {
-                       if(tag_name)
-                               SAFE_FREE(tag_name);
+               SAFE_FREE(tag_name);
 
-                       tag_name = strdup((const char *)sqlite3_column_text(stmt, 1));
-               }
+               id = (int)sqlite3_column_int(stmt,0);
+               tag_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
        }
 
        _tag->tag_id = id;
@@ -377,11 +372,7 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag)
                }
 
                _tag->tag_id = (int)sqlite3_column_int(stmt, 0);
-
-               if(STRING_VALID((const char *)sqlite3_column_text(stmt, 1)))
-               {
-                       _tag->name = strdup((const char *)sqlite3_column_text(stmt, 1));
-               }
+               _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
 
                *tag = (media_tag_h)_tag;
        }