ip6-nd: fix coverity warning

Restructure code to avoid NULL dereference.

Type: fix
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Change-Id: If3a4319f1b93af272b7b315a9b15ba4ee1f8e7ae

diff --git a/src/vnet/ip6-nd/ip6_ra.c b/src/vnet/ip6-nd/ip6_ra.c
index d359770..dac5ec0 100644 (file)
--- a/src/vnet/ip6-nd/ip6_ra.c
+++ b/src/vnet/ip6-nd/ip6_ra.c
@@ -413,12 +413,9 @@ icmp6_router_solicitation (vlib_main_t * vm,
 
                  radv_info = ip6_ra_get_itf (sw_if_index0);
 
-                 error0 = ((!radv_info) ?
-                           ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-                           error0);
-                 error0 = radv_info->send_radv == 0 ?
-                            ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
-                            error0;
+                 error0 = ((!radv_info || 0 == radv_info->send_radv) ?
+                             ICMP6_ERROR_ROUTER_SOLICITATION_RADV_NOT_CONFIG :
+                             error0);
                  if (error0 == ICMP6_ERROR_NONE)
                    {
                      f64 now = vlib_time_now (vm);