Fix to access NULL pointer before it is checked

Change-Id: I14fe724694dcde45709161de4dc786cb036a909b
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/capi-media-controller.spec b/packaging/capi-media-controller.spec
index 185fc0f302dabe18c61b477f0a31bd6aa78fa2e1..77fcf3e6685bef4a27a947c7c79dba662f5d9f3d 100755 (executable)
--- a/packaging/capi-media-controller.spec
+++ b/packaging/capi-media-controller.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-controller
 Summary:    A media controller library in Tizen Native API
-Version:    0.1.42
+Version:    0.1.43
 Release:    1
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_controller_client.c b/src/media_controller_client.c
index 057090f8ef0dc797564f39a23bbc204a9eada67f..e300333e828ef036c408b802d677746873f9332c 100755 (executable)
--- a/src/media_controller_client.c
+++ b/src/media_controller_client.c
@@ -23,9 +23,9 @@ static void __client_server_cb(const char *interface_name, const char *signal_na
 {
        gchar **params = NULL;
        media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data;
+       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_server_state_updated_cb callback = (mc_server_state_updated_cb)reciever->callback;
 
-       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_retm_if(reciever->callback == NULL, "server_state_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
@@ -43,10 +43,10 @@ static void __client_playback_cb(const char *interface_name, const char *signal_
 {
        gchar **params = NULL;
        media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data;
+       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_playback_updated_cb callback = (mc_playback_updated_cb)reciever->callback;
        media_controller_playback_s *playback = NULL;
 
-       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_retm_if(reciever->callback == NULL, "playback_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
@@ -77,9 +77,9 @@ static void __client_metadata_cb(const char *interface_name, const char *signal_
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
        mc_metadata_h metadata = NULL;
        media_controller_client_s *mc_client = (media_controller_client_s *)user_data;
+       mc_retm_if(mc_client == NULL, "mc_client is NULL");
        mc_metadata_updated_cb callback = (mc_metadata_updated_cb)mc_client->metadata_cb.callback;
 
-       mc_retm_if(mc_client == NULL, "mc_client is NULL");
        mc_retm_if(mc_client->metadata_cb.callback == NULL, "metadata_cb is NULL");
        mc_retm_if(message == NULL, "message is NULL");
 
@@ -98,9 +98,9 @@ static void __client_shuffle_cb(const char *interface_name, const char *signal_n
 {
        gchar **params = NULL;
        media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data;
+       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_shuffle_mode_changed_cb callback = (mc_shuffle_mode_changed_cb)reciever->callback;
 
-       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_retm_if(reciever->callback == NULL, "shuffle_cb is NULL");
 
        mc_debug("__client_shuffle_cb(%s, %s, %s, %d, %p)", interface_name, signal_name, message, size, user_data);
@@ -117,9 +117,9 @@ static void __client_repeat_cb(const char *interface_name, const char *signal_na
 {
        gchar **params = NULL;
        media_controller_receiver_s *reciever = (media_controller_receiver_s *)user_data;
+       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_repeat_mode_changed_cb callback = (mc_repeat_mode_changed_cb)reciever->callback;
 
-       mc_retm_if(reciever == NULL, "reciever is NULL");
        mc_retm_if(reciever->callback == NULL, "repeat_cb is NULL");
 
        mc_debug("__client_repeat_cb(%s, %s, %s, %d, %p)", interface_name, signal_name, message, size, user_data);