From bf8ba84c2b42496c666ba725f02612bcf0001245 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 11 May 2019 13:18:29 -0400 Subject: [PATCH] zebra: Make coverity SA happy with zebra_routemap.c The CLI code ensures that the clippy code produces valid input for the zebra_routemap.c functions, but coverity SA does not understand this fact. So add some asserts to make the coverity SA happy. Signed-off-by: Donald Sharp --- zebra/zebra_routemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 5355fa062e..f48bf3b033 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -705,6 +705,9 @@ DEFPY (ip_protocol, { int ret, rtype; + assert(proto); + assert(rmap); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -737,6 +740,8 @@ DEFPY (no_ip_protocol, { int ret, rtype; + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -781,6 +786,9 @@ DEFPY (ipv6_protocol, { int ret, rtype; + assert(rmap); + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -813,6 +821,8 @@ DEFPY (no_ipv6_protocol, { int ret, rtype; + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -858,6 +868,9 @@ DEFPY (ip_protocol_nht_rmap, int ret, rtype; + assert(proto); + assert(rmap); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -890,6 +903,8 @@ DEFPY (no_ip_protocol_nht_rmap, { int ret, rtype; + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -935,6 +950,9 @@ DEFPY (ipv6_protocol_nht_rmap, { int ret, rtype; + assert(rmap); + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) @@ -967,6 +985,8 @@ DEFPY (no_ipv6_protocol_nht_rmap, { int ret, rtype; + assert(proto); + ZEBRA_DECLVAR_CONTEXT(vrf, zvrf); if (!zvrf) -- 2.39.5