]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
ndisc: use memzero() where appropriate
authorLennart Poettering <lennart@poettering.net>
Tue, 9 Apr 2024 16:45:56 +0000 (18:45 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 10 Apr 2024 07:54:20 +0000 (16:54 +0900)
src/libsystemd-network/ndisc-option.c

index 5a3847686ace8beb37aa6c92247f397c25223301..447b14d15b10946438c1f533fd6547ac7f0b3a72 100644 (file)
@@ -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;