From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 9 Apr 2024 16:45:56 +0000 (+0200)
Subject: ndisc: use memzero() where appropriate
X-Git-Tag: v256-rc1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=475107f014373018c753500a89a2f02bb4506edd;p=thirdparty%2Fsystemd.git

ndisc: use memzero() where appropriate
---

diff --git a/src/libsystemd-network/ndisc-option.c b/src/libsystemd-network/ndisc-option.c
index 5a3847686ac..447b14d15b1 100644
--- a/src/libsystemd-network/ndisc-option.c
+++ b/src/libsystemd-network/ndisc-option.c
@@ -1041,8 +1041,7 @@ static int ndisc_option_parse_dnssl(Set **options, size_t offset, size_t len, co
                 remaining -= r;
         }
 
-        if (remaining > 0)
-                memset(p, 0, remaining);
+        memzero(p, remaining);
 
         *ret = TAKE_PTR(buf);
         return 0;
@@ -1121,8 +1120,8 @@ static int ndisc_option_build_captive_portal(const sd_ndisc_option *option, uint
 
         uint8_t *p = mempcpy(buf + 2, option->captive_portal, len_portal);
         size_t remaining = len * 8 - 2 - len_portal;
-        if (remaining > 0)
-                memset(p, 0, remaining);
+
+        memzero(p, remaining);
 
         *ret = TAKE_PTR(buf);
         return 0;