Merge tag 'upstream/1.41' into tizen

[platform/upstream/connman.git] / gdhcp / client.c

diff --git a/gdhcp/client.c b/gdhcp/client.c
index 18f11a6..905cecf 100755 (executable)
--- a/gdhcp/client.c
+++ b/gdhcp/client.c
@@ -2433,6 +2433,9 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                dhcp_client->retry_times = 0;
 
                option = dhcp_get_option(&packet, pkt_len, DHCP_SERVER_ID);
+               if (!option)
+                       return TRUE;
+
                dhcp_client->server_ip = get_be32(option);
                dhcp_client->requested_ip = ntohl(packet.yiaddr);
 
@@ -2498,6 +2501,8 @@ static gboolean listener_event(GIOChannel *channel, GIOCondition condition,
                        if (dhcp_client->state == REBOOTING) {
                                option = dhcp_get_option(&packet, pkt_len,
                                                        DHCP_SERVER_ID);
+                               if (!option)
+                                       return TRUE;
                                dhcp_client->server_ip = get_be32(option);
                        }