git.tremily.us Git - gentoo.git/blob

   1 diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c
   2 --- a/wpa_supplicant/dbus/dbus_new_helpers.c    2012-05-15 07:28:37.616150164 +0000
   3 +++ b/wpa_supplicant/dbus/dbus_new_helpers.c    2012-05-15 07:30:21.904157611 +0000
   4 @@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru
   5         const struct wpa_dbus_property_desc *dsc;
   6         int i = 0;
   7
   8 -       if (iface == NULL)
   9 +       if (iface == NULL || path == NULL)
  10                 return;
  11
  12         dbus_connection_get_object_path_data(iface->con, path,
  13 diff -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c
  14 --- a/wpa_supplicant/dbus/dbus_old.c    2012-05-15 07:28:29.502149373 +0000
  15 +++ b/wpa_supplicant/dbus/dbus_old.c    2012-05-15 07:30:48.859162441 +0000
  16 @@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res
  17         DBusMessage *_signal;
  18
  19         /* Do nothing if the control interface is not turned on */
  20 -       if (iface == NULL)
  21 +       if (iface == NULL || wpa_s->dbus_path == NULL)
  22                 return;
  23
  24         _signal = dbus_message_new_signal(wpa_s->dbus_path,
  25 @@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch
  26         if (wpa_s->global == NULL)
  27                 return;
  28         iface = wpa_s->global->dbus;
  29 -       if (iface == NULL)
  30 +       if (iface == NULL || wpa_s->dbus_path == NULL)
  31                 return;
  32
  33         /* Only send signal if state really changed */
  34 @@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning
  35         dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
  36
  37         /* Do nothing if the control interface is not turned on */
  38 -       if (iface == NULL)
  39 +       if (iface == NULL || wpa_s->dbus_path == NULL)
  40                 return;
  41
  42         _signal = dbus_message_new_signal(wpa_s->dbus_path,
  43 @@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred
  44         if (wpa_s->global == NULL)
  45                 return;
  46         iface = wpa_s->global->dbus;
  47 -       if (iface == NULL)
  48 +       if (iface == NULL || wpa_s->dbus_path == NULL)
  49                 return;
  50
  51         _signal = dbus_message_new_signal(wpa_s->dbus_path,
  52 @@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific
  53         if (wpa_s->global == NULL)
  54                 return;
  55         iface = wpa_s->global->dbus;
  56 -       if (iface == NULL)
  57 +       if (iface == NULL || wpa_s->dbus_path == NULL)
  58                 return;
  59
  60         _signal = dbus_message_new_signal(wpa_s->dbus_path,