Merge "[SPIN] Add NULL check to prevent crash." into tizen
authortaesub kim <taesub.kim@samsung.com>
Mon, 13 Jun 2016 02:19:50 +0000 (19:19 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 13 Jun 2016 02:19:50 +0000 (19:19 -0700)
1  2 
src/service.c

diff --combined src/service.c
@@@ -1896,10 -1896,8 +1896,10 @@@ static void state_changed(struct connma
        if (!str)
                return;
  
 +#if !defined TIZEN_EXT
        if (!allow_property_changed(service))
                return;
 +#endif
  
        connman_dbus_property_changed_basic(service->path,
                                CONNMAN_SERVICE_INTERFACE, "State",
@@@ -2718,13 -2716,11 +2718,13 @@@ static void append_wifi_ext_info(DBusMe
        unsigned int maxrate;
        uint16_t frequency;
        const char *enc_mode;
 +      gboolean passpoint;
  
        bssid = connman_network_get_bssid(network);
        maxrate = connman_network_get_maxrate(network);
        frequency = connman_network_get_frequency(network);
        enc_mode = connman_network_get_enc_mode(network);
 +      passpoint = connman_network_get_is_hs20AP(network);
  
        snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
                                bssid[0], bssid[1], bssid[2],
                                        DBUS_TYPE_UINT16, &frequency);
        connman_dbus_dict_append_basic(dict, "EncryptionMode",
                                        DBUS_TYPE_STRING, &enc_mode);
 +      connman_dbus_dict_append_basic(dict, "Passpoint",
 +                                      DBUS_TYPE_BOOLEAN, &passpoint);
  }
  #endif
  
@@@ -5150,6 -5144,10 +5150,10 @@@ static void service_schedule_removed(st
  
  static bool allow_property_changed(struct connman_service *service)
  {
+ #if defined TIZEN_EXT
+       if (service->path == NULL)
+               return FALSE;
+ #endif
        if (g_hash_table_lookup_extended(services_notify->add, service->path,
                                        NULL, NULL)) {
                DBG("no property updates for service %p", service);