X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fadj%2Fadj.c;h=0966d97cc6d66982502c4f338ba06e36e6cdd0a2;hb=972d71da8683259c238b3b0e69665655f2d35b70;hp=ee9a1440f60d417527014123ec4c62a2bb7bbe35;hpb=8feeaff56fa9a4fbdfc06131f28a1060ffd9645d;p=vpp.git

diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index ee9a1440f60..0966d97cc6d 100644
--- a/src/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
@@ -139,6 +139,10 @@ format_ip_adjacency (u8 * s, va_list * args)
 
     adj_index = va_arg (*args, u32);
     fiaf = va_arg (*args, format_ip_adjacency_flags_t);
+
+    if (!adj_is_valid(adj_index))
+      return format(s, "<invalid adjacency>");
+
     adj = adj_get(adj_index);
 
     switch (adj->lookup_next_index)
@@ -179,7 +183,7 @@ format_ip_adjacency (u8 * s, va_list * args)
         s = format (s, "\n   counts:[%Ld:%Ld]", counts.packets, counts.bytes);
 	s = format (s, "\n   locks:%d", adj->ia_node.fn_locks);
 	s = format(s, "\n delegates:\n  ");
-        adj_delegate_format(s, adj);
+        s = adj_delegate_format(s, adj);
 
 	s = format(s, "\n children:");
         if (fib_node_list_get_size(adj->ia_node.fn_children))