]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: clean up nhg allocations in error path 9387/head
authorMark Stapp <mjs.ietf@gmail.com>
Wed, 11 Aug 2021 14:41:53 +0000 (10:41 -0400)
committermergify-bot <noreply@mergify.io>
Thu, 12 Aug 2021 19:37:57 +0000 (19:37 +0000)
Clean up allocated nhgs in error path in zread_nhg_add().

Signed-off-by: Mark Stapp <mjs.ietf@gmail.com>
(cherry picked from commit fd99142ab79e265840ebb1990d4348dfcf47de14)

zebra/zapi_msg.c

index 544bb07fbef42fc93e94e3bf8629ff32db99a82c..0615593ef707ec624dfb2a7f275e97b6f29f44ea 100644 (file)
@@ -1917,6 +1917,11 @@ static void zread_nhg_add(ZAPI_HANDLER_ARGS)
 
                flog_warn(EC_ZEBRA_NEXTHOP_CREATION_FAILED,
                          "%s: Nexthop Group Creation failed", __func__);
+
+               /* Free any local allocations */
+               nexthop_group_delete(&nhg);
+               zebra_nhg_backup_free(&bnhg);
+
                return;
        }