First check the index size of signal map

[platform/core/connectivity/stc-manager.git] / plugin / appstatus / stc-plugin-appstatus.c

diff --git a/plugin/appstatus/stc-plugin-appstatus.c b/plugin/appstatus/stc-plugin-appstatus.c
index 108e0ab..ced6be6 100755 (executable)
--- a/plugin/appstatus/stc-plugin-appstatus.c
+++ b/plugin/appstatus/stc-plugin-appstatus.c
@@ -133,7 +133,7 @@ static stc_error_e __ground_status_monitor_init(stc_s *stc)
 
        size = sizeof(signal_map) / sizeof(signal_map[0]);
 
-       for (i = 0; signal_map[i].member != NULL && i < size; i++) {
+       for (i = 0; i < size && signal_map[i].member != NULL; i++) {
                signal_map[i].sub_id =
                        g_dbus_connection_signal_subscribe(stc->connection,
                                                           NULL,
@@ -161,7 +161,7 @@ static stc_error_e __ground_status_monitor_deinit(stc_s *stc)
 
        size = sizeof(signal_map) / sizeof(signal_map[0]);
 
-       for (i = 0; signal_map[i].member != NULL && i < size; i++) {
+       for (i = 0; i < size && signal_map[i].member != NULL; i++) {
                g_dbus_connection_signal_unsubscribe(stc->connection,
                                                     signal_map[i].sub_id);
                signal_map[i].sub_id = 0;