Merge pull request #4357 from sworleys/Table-Null-Cov

zebra: Continue rm update if table not found

diff --git a/zebra/redistribute.c b/zebra/redistribute.c
index f3155deb146cfdccb3f905a9be708cae37bf538e..b13f1170cd5defa3dc53c1d32b0b3d327b81961b 100644 (file)
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -770,6 +770,13 @@ void zebra_import_table_rm_update(const char *rmap)
                                continue;
                        table = zebra_vrf_table_with_table_id(afi, SAFI_UNICAST,
                                                              i, VRF_DEFAULT);
+                       if (!table) {
+                               if (IS_ZEBRA_DEBUG_RIB_DETAILED)
+                                       zlog_debug("%s: Table id=%d not found",
+                                                  __func__, i);
+                               continue;
+                       }
+
                        for (rn = route_top(table); rn; rn = route_next(rn)) {
                                /* For each entry in the non-default
                                 * routing table,