Add code for exception handling

Change-Id: I7e29f9bbfff90b8b7e5dc381bc112aab9bf86109

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index e6c4b0b4f96952b011fcdc4d2b31e0bc7359d870..29129d5ee8de3369b23f4e6f44efbd4ef0e24e86 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -1048,7 +1048,6 @@ int mc_client_get_server_playlist(mc_client_h client, const char *server_name, c
 
        mc_retvm_if(mc_client == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Handle is NULL");
        mc_retvm_if(!MC_STRING_VALID(server_name), MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "Invalid server_name");
-       mc_retvm_if(playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playlist is NULL");
 
        ret = mc_db_check_server_table_exist(mc_client->db_handle, server_name, &exist_server);
        mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, ret, "Error mc_db_check_server_table_exist [%d]", ret);

diff --git a/src/media_controller_db.c b/src/media_controller_db.c
index c009232738cee5977acdd4ae1694788dceb9c9c0..7540d66b9346809f7ad0601bb0861b016dcd143f 100755 (executable)
--- a/src/media_controller_db.c
+++ b/src/media_controller_db.c
@@ -173,8 +173,13 @@ static int __db_get_playlist(void *handle, const char *server_name, char **playl
 
        MC_SAFE_FREE(_raw_data);
 
-       *playlist_name = _name;
-       *playlist = _bundle_data;
+       if (playlist_name != NULL && playlist != NULL) {
+               *playlist_name = _name;
+               *playlist = _bundle_data;
+       } else {
+               mc_retvm_if(playlist_name == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playlist_name is null");
+               mc_retvm_if(playlist == NULL, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER, "playlist is null");
+       }
 
        return MEDIA_CONTROLLER_ERROR_NONE;
 }