From 550b50905c4deee5d2dbc86f79ee59f3d97970ed Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 22 Jan 2025 11:16:10 +0100 Subject: [PATCH] pbrd: initialize structs used in hash_lookup Doesn't seem to break anything but really poor style to pass potentially uninitialized data to hash_lookup. Signed-off-by: David Lamparter (cherry picked from commit c88589f5e9351654c04322eb395003297656989d) --- pbrd/pbr_nht.c | 8 ++++---- pbrd/pbr_vty.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pbrd/pbr_nht.c b/pbrd/pbr_nht.c index cbff4832a4..ec6ebb4c20 100644 --- a/pbrd/pbr_nht.c +++ b/pbrd/pbr_nht.c @@ -502,7 +502,7 @@ void pbr_nht_change_group(const char *name) } for (ALL_NEXTHOPS(nhgc->nhg, nhop)) { - struct pbr_nexthop_cache lookup; + struct pbr_nexthop_cache lookup = {}; struct pbr_nexthop_cache *pnhc; lookup.nexthop = *nhop; @@ -571,7 +571,7 @@ void pbr_nht_add_individual_nexthop(struct pbr_map_sequence *pbrms, struct pbr_nexthop_group_cache *pnhgc; struct pbr_nexthop_group_cache find; struct pbr_nexthop_cache *pnhc; - struct pbr_nexthop_cache lookup; + struct pbr_nexthop_cache lookup = {}; struct nexthop *nh; char buf[PBR_NHC_NAMELEN]; @@ -629,7 +629,7 @@ static void pbr_nht_release_individual_nexthop(struct pbr_map_sequence *pbrms) struct pbr_nexthop_group_cache *pnhgc; struct pbr_nexthop_group_cache find; struct pbr_nexthop_cache *pnhc; - struct pbr_nexthop_cache lup; + struct pbr_nexthop_cache lup = {}; struct nexthop *nh; enum nexthop_types_t nh_type = 0; @@ -687,7 +687,7 @@ struct pbr_nexthop_group_cache *pbr_nht_add_group(const char *name) DEBUGD(&pbr_dbg_nht, "%s: Retrieved NHGC @ %p", __func__, pnhgc); for (ALL_NEXTHOPS(nhgc->nhg, nhop)) { - struct pbr_nexthop_cache lookupc; + struct pbr_nexthop_cache lookupc = {}; struct pbr_nexthop_cache *pnhc; lookupc.nexthop = *nhop; diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c index 60e215e731..40e5a7af03 100644 --- a/pbrd/pbr_vty.c +++ b/pbrd/pbr_vty.c @@ -854,7 +854,7 @@ pbrms_nexthop_group_write_individual_nexthop( { struct pbr_nexthop_group_cache find; struct pbr_nexthop_group_cache *pnhgc; - struct pbr_nexthop_cache lookup; + struct pbr_nexthop_cache lookup = {}; struct pbr_nexthop_cache *pnhc; memset(&find, 0, sizeof(find)); -- 2.39.5