Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | In networks that don't have a DHCP server configured, ipv4 address |
| 2 | allocation fails and the ipv4 structure doesn't get populated. When |
| 3 | the GUI is trying to read the ipv4_config.method field to see whether |
| 4 | it contains "dhcp" string, a segmentation fault is generated. |
| 5 | |
| 6 | Ethernet manual configuration behavior remains unchanged after this fix. |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> |
| 11 | Index: git/properties/ethernet.c |
| 12 | =================================================================== |
| 13 | --- git.orig/properties/ethernet.c |
| 14 | +++ git/properties/ethernet.c |
| 15 | @@ -194,7 +194,7 @@ void add_ethernet_service(GtkWidget *mai |
| 16 | |
| 17 | data->button = button; |
| 18 | |
| 19 | - if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) |
| 20 | + if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) |
| 21 | update_ethernet_ipv4(data, CONNMAN_POLICY_DHCP); |
| 22 | else |
| 23 | update_ethernet_ipv4(data, CONNMAN_POLICY_MANUAL); |
| 24 | Index: git/properties/wifi.c |
| 25 | =================================================================== |
| 26 | --- git.orig/properties/wifi.c |
| 27 | +++ git/properties/wifi.c |
| 28 | @@ -230,7 +230,7 @@ static void wifi_ipconfig(GtkWidget *tab |
| 29 | |
| 30 | data->ipv4_config = ipv4_config; |
| 31 | |
| 32 | - if (g_str_equal(ipv4_config.method, "dhcp") == TRUE) |
| 33 | + if (!ipv4_config.method || g_str_equal(ipv4_config.method, "dhcp") == TRUE) |
| 34 | update_wifi_ipv4(data, CONNMAN_POLICY_DHCP); |
| 35 | else |
| 36 | update_wifi_ipv4(data, CONNMAN_POLICY_MANUAL); |