summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2020-02-20 13:40:02 +0100
committerGitHub <noreply@github.com>2020-02-20 13:40:02 +0100
commitf294fac22d152ca1a31c3d87939c3a6f58ec0ce0 (patch)
tree5b8667dffddda57a9150de1c4eccf237ae28de2d
parentMerge pull request #5845 from TomasKorbar/master (diff)
parentlib: do not test before XFREE (diff)
downloadfrr-f294fac22d152ca1a31c3d87939c3a6f58ec0ce0.tar.xz
frr-f294fac22d152ca1a31c3d87939c3a6f58ec0ce0.zip
Merge pull request #5842 from qlyoung/fix-test-then-xfree-again
lib: do not test before XFREE
-rw-r--r--lib/routemap_northbound.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/routemap_northbound.c b/lib/routemap_northbound.c
index 68b112b09..2d04a3d65 100644
--- a/lib/routemap_northbound.c
+++ b/lib/routemap_northbound.c
@@ -243,9 +243,7 @@ static int lib_route_map_entry_description_destroy(enum nb_event event,
break;
case NB_EV_APPLY:
rmi = nb_running_get_entry(dnode, NULL, true);
- if (rmi->description != NULL)
- XFREE(MTYPE_TMP, rmi->description);
- rmi->description = NULL;
+ XFREE(MTYPE_TMP, rmi->description);
break;
}