summaryrefslogtreecommitdiff
path: root/lib/vty.c
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2020-02-05 01:49:08 -0300
committerGitHub <noreply@github.com>2020-02-05 01:49:08 -0300
commitecaeb3b697bfcd46fe4ee7a519fdebb69c7318f9 (patch)
treed631ffc455be41355b1f6f763958a4cfbcf4a5d5 /lib/vty.c
parent8f6ebcbeb2455855a0e9dd2946d48e8db23f7192 (diff)
parente1b36e132b7eda2d230f2f95945e231df37a42f5 (diff)
Merge pull request #5750 from qlyoung/fix-null-after-xfree
*: don't null after XFREE; XFREE does this itself
Diffstat (limited to 'lib/vty.c')
-rw-r--r--lib/vty.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 40da8abcd7..cf16133852 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -3011,15 +3011,8 @@ void vty_reset(void)
vty_timeout_val = VTY_TIMEOUT_DEFAULT;
- if (vty_accesslist_name) {
- XFREE(MTYPE_VTY, vty_accesslist_name);
- vty_accesslist_name = NULL;
- }
-
- if (vty_ipv6_accesslist_name) {
- XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
- vty_ipv6_accesslist_name = NULL;
- }
+ XFREE(MTYPE_VTY, vty_accesslist_name);
+ XFREE(MTYPE_VTY, vty_ipv6_accesslist_name);
}
static void vty_save_cwd(void)