Merge pull request #7309 from mjstapp/fix_ospf_gr_reasons

ospfd: make GR reason string production safer

diff --cc ospfd/ospf_gr_helper.c
index bf6a45bcdbf3fd3755654885c629d489ab9006f3,391c8024046ddf58d2b813aa86b7fb6b2a520bd4..616013fb9e501f326a1bccbf76603b255552912f
--- 1/ospfd/ospf_gr_helper.c
--- 2/ospfd/ospf_gr_helper.c
+++ b/ospfd/ospf_gr_helper.c
@@@ -1018,17 -982,9 +1052,17 @@@ static void show_ospf_grace_lsa_info(st
                        sum += TLV_SIZE(tlvh);
  
                        vty_out(vty, "   Restart reason:%s\n",
-                               ospf_restart_reason_desc[grReason->reason]);
+                               ospf_restart_reason2str(grReason->reason));
                        break;
                case RESTARTER_IP_ADDR_TYPE:
 +                      if (TLV_SIZE(tlvh) <
 +                          sizeof(struct grace_tlv_restart_addr)) {
 +                              vty_out(vty,
 +                                      "%% Invalid addr TLV length %zu\n",
 +                                      TLV_SIZE(tlvh));
 +                              return;
 +                      }
 +
                        restartAddr = (struct grace_tlv_restart_addr *)tlvh;
                        sum += TLV_SIZE(tlvh);