summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2022-07-17 21:58:48 +0300
committerGitHub <noreply@github.com>2022-07-17 21:58:48 +0300
commit77b2c28e6f4d73b827e470fb96a194588b9d16da (patch)
tree380e5af7b0d9aaa8f3aba8e1983715c406934d09
parent26b2fbf47914545dc7688ef7943e5396a77f8b10 (diff)
parent2e4e3ba10b21abcf6fa89b0f1c1a8559bb0b4ce6 (diff)
Merge pull request #11622 from donaldsharp/valgrind_issues
Valgrind issues
-rw-r--r--lib/filter_nb.c2
-rw-r--r--zebra/zebra_nhg.c2
-rw-r--r--zebra/zebra_vty.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index 35b97a9bde..3ed1f3e03e 100644
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -428,7 +428,7 @@ static void plist_dnode_to_prefix(const struct lyd_node *dnode, bool *any,
static int _plist_is_dup(const struct lyd_node *dnode, void *arg)
{
struct plist_dup_args *pda = arg;
- struct prefix p;
+ struct prefix p = {};
int ge, le;
bool any;
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 8a255981b7..f846164834 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -1611,6 +1611,8 @@ void zebra_nhg_free(struct nhg_hash_entry *nhe)
nhe->nhg.nexthop);
}
+ THREAD_OFF(nhe->timer);
+
if (nhe->refcnt)
zlog_debug("nhe_id=%pNG hash refcnt=%d", nhe, nhe->refcnt);
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index e6038d0bc2..525e0366e7 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -4033,6 +4033,7 @@ DEFUN (show_zebra,
vty_out(vty, "%s\n", out);
XFREE(MTYPE_TMP, out);
+ ttable_del(table);
vty_out(vty,
" Route Route Neighbor LSP LSP\n");
vty_out(vty,