From 35793bb8325cb8651696e55bb1c6100d2cf742c7 Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Tue, 5 Apr 2022 09:14:20 -0400 Subject: [PATCH] use fewer memset new VPs are always initialized to zero --- src/bin/radclient.c | 3 +-- src/protocols/dhcpv6/decode.c | 5 ----- src/protocols/dns/decode.c | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/bin/radclient.c b/src/bin/radclient.c index 7b7bd9ad90..3d21453b50 100644 --- a/src/bin/radclient.c +++ b/src/bin/radclient.c @@ -220,9 +220,8 @@ static int mschapv1_encode(fr_radius_packet_t *packet, fr_pair_list_t *list, MEM(reply = fr_pair_afrom_da(packet, attr_ms_chap_response)); fr_pair_append(list, reply); - p = talloc_array(reply, uint8_t, 50); + p = talloc_zero_array(reply, uint8_t, 50); /* really reply->da->flags.length */ fr_pair_value_memdup_buffer_shallow(reply, p, false); - memset(p, 0, reply->vp_length); p[1] = 0x01; /* NT hash */ diff --git a/src/protocols/dhcpv6/decode.c b/src/protocols/dhcpv6/decode.c index 66671a9929..6c8e96fb0c 100644 --- a/src/protocols/dhcpv6/decode.c +++ b/src/protocols/dhcpv6/decode.c @@ -170,9 +170,6 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, if (!vp) return PAIR_DECODE_OOM; vp->vp_ip.af = AF_INET6; - vp->vp_ip.scope_id = 0; - vp->vp_ip.prefix = 0; - memset(&vp->vp_ipv6addr, 0, sizeof(vp->vp_ipv6addr)); break; } @@ -188,9 +185,7 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, if (!vp) return PAIR_DECODE_OOM; vp->vp_ip.af = AF_INET6; - vp->vp_ip.scope_id = 0; vp->vp_ip.prefix = prefix_len; - memset(&vp->vp_ipv6addr, 0, sizeof(vp->vp_ipv6addr)); memcpy(&vp->vp_ipv6addr, data + 1, data_len - 1); break; diff --git a/src/protocols/dns/decode.c b/src/protocols/dns/decode.c index 80b07a4d97..45d55d4c42 100644 --- a/src/protocols/dns/decode.c +++ b/src/protocols/dns/decode.c @@ -138,7 +138,6 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, if (!vp) return PAIR_DECODE_OOM; vp->vp_ip.af = AF_INET6; - vp->vp_ip.scope_id = 0; vp->vp_ip.prefix = data[0]; memcpy(&vp->vp_ipv6addr, data + 1, data_len - 1); break; @@ -154,9 +153,6 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, if (!vp) return PAIR_DECODE_OOM; vp->vp_ip.af = AF_INET6; - vp->vp_ip.scope_id = 0; - vp->vp_ip.prefix = 0; - memset(&vp->vp_ipv6addr, 0, sizeof(vp->vp_ipv6addr)); break; } @@ -172,9 +168,7 @@ static ssize_t decode_value(TALLOC_CTX *ctx, fr_pair_list_t *out, if (!vp) return PAIR_DECODE_OOM; vp->vp_ip.af = AF_INET6; - vp->vp_ip.scope_id = 0; vp->vp_ip.prefix = prefix_len; - memset(&vp->vp_ipv6addr, 0, sizeof(vp->vp_ipv6addr)); memcpy(&vp->vp_ipv6addr, data + 1, data_len - 1); break; -- 2.47.2