use zero_bytes() instead of memset() for consistency

diff --git a/defaults.c b/defaults.c
index 7ea686eeb2b0cb5f283e4710749c5460c282a1ef..b588241b3396003fcca000b6feb5af937c15066d 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -367,7 +367,7 @@ init_defaults()
                    list_op(NULL, 0, def, freeall);
                    break;
            }
-           memset(&def->sd_un, 0, sizeof(def->sd_un));
+           zero_bytes(&def->sd_un, sizeof(def->sd_un));
        }
     }
 

diff --git a/interfaces.c b/interfaces.c
index 49a5a3b753b7f8a1b8cbee5a89857afb5db9f3a2..7c2f4d4066dc6f36af7b071591422f73511716dc 100644 (file)
--- a/interfaces.c
+++ b/interfaces.c
@@ -244,7 +244,7 @@ load_interfaces()
                continue;
 
 #ifdef SIOCGIFFLAGS
-       memset(&ifr_tmp, 0, sizeof(ifr_tmp));
+       zero_bytes(&ifr_tmp, sizeof(ifr_tmp));
        strncpy(ifr_tmp.ifr_name, ifr->ifr_name, sizeof(ifr_tmp.ifr_name) - 1);
        if (ioctl(sock, SIOCGIFFLAGS, (caddr_t) &ifr_tmp) < 0)
 #endif
@@ -262,7 +262,7 @@ load_interfaces()
        previfname = ifr->ifr_name;
 
        /* Get the netmask. */
-       (void) memset(&ifr_tmp, 0, sizeof(ifr_tmp));
+       zero_bytes(&ifr_tmp, sizeof(ifr_tmp));
        strncpy(ifr_tmp.ifr_name, ifr->ifr_name, sizeof(ifr_tmp.ifr_name) - 1);
 #ifdef SIOCGIFNETMASK
 #ifdef _ISC

diff --git a/pwutil.c b/pwutil.c
index 941b3267c59d42aebd2d2e02b5a4d0aff0cf5a0b..f1f142662c1e5422fcb3842499f0ca0212b80ca4 100644 (file)
--- a/pwutil.c
+++ b/pwutil.c
@@ -214,7 +214,7 @@ sudo_getpwuid(uid)
        return(pw);
     } else {
        pw = emalloc(sizeof(*pw));
-       memset(pw, 0, sizeof(*pw));
+       zero_bytes(pw, sizeof(*pw));
        pw->pw_uid = uid;
        if (rbinsert(pwcache_byuid, (void *) pw) != NULL)
            errorx(1, "unable to cache uid, already exists");
@@ -258,7 +258,7 @@ sudo_getpwnam(name)
     } else {
        len = strlen(name) + 1;
        cp = emalloc(sizeof(*pw) + len);
-       memset(cp, 0, sizeof(*pw));
+       zero_bytes(cp, sizeof(*pw));
        pw = (struct passwd *) cp;
        cp += sizeof(*pw);
        memcpy(cp, name, len);
@@ -286,7 +286,7 @@ sudo_fakepwnam(user, gid)
     pw = emalloc(sizeof(struct passwd) + len + 1 /* pw_name */ +
        sizeof("*") /* pw_passwd */ + sizeof("") /* pw_gecos */ +
        sizeof("/") /* pw_dir */ + sizeof(_PATH_BSHELL));
-    memset(pw, 0, sizeof(struct passwd));
+    zero_bytes(pw, sizeof(struct passwd));
     pw->pw_uid = (uid_t) atoi(user + 1);
     pw->pw_gid = gid;
     pw->pw_name = (char *)pw + sizeof(struct passwd);
@@ -325,7 +325,7 @@ sudo_fakegrnam(group)
 
     len = strlen(group);
     gr = emalloc(sizeof(struct group) + len + 1);
-    memset(gr, 0, sizeof(struct group));
+    zero_bytes(gr, sizeof(struct group));
     gr->gr_gid = (gid_t) atoi(group + 1);
     gr->gr_name = (char *)gr + sizeof(struct group);
     strlcpy(gr->gr_name, group, len + 1);
@@ -493,7 +493,7 @@ sudo_getgrgid(gid)
        return(gr);
     } else {
        gr = emalloc(sizeof(*gr));
-       memset(gr, 0, sizeof(*gr));
+       zero_bytes(gr, sizeof(*gr));
        gr->gr_gid = gid;
        if (rbinsert(grcache_bygid, (void *) gr) != NULL)
            errorx(1, "unable to cache gid, already exists");
@@ -531,7 +531,7 @@ sudo_getgrnam(name)
     } else {
        len = strlen(name) + 1;
        cp = emalloc(sizeof(*gr) + len);
-       memset(cp, 0, sizeof(*gr));
+       zero_bytes(cp, sizeof(*gr));
        gr = (struct group *) cp;
        cp += sizeof(*gr);
        memcpy(cp, name, len);

diff --git a/sudo.c b/sudo.c
index a91b4b1b7d2a134d0a96801f3cbe115c79eb9a75..4246c6dd0a286216d025a420a7279c0ec2086ff1 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -1284,7 +1284,7 @@ set_fqdn()
     char *p;
 
 #ifdef HAVE_GETADDRINFO
-    memset(&hint, 0, sizeof(hint));
+    zero_bytes(&hint, sizeof(hint));
     hint.ai_family = PF_UNSPEC;
     hint.ai_flags = AI_CANONNAME;
     if (getaddrinfo(user_host, NULL, &hint, &res0) != 0) {

diff --git a/sudo_edit.c b/sudo_edit.c
index 6b82ee36ee7d7d49b55bb7c043c94bc45a2f29d9..928ac61dd8e9fc5a9e5818af5874ba0ac84face3 100644 (file)
--- a/sudo_edit.c
+++ b/sudo_edit.c
@@ -115,13 +115,13 @@ sudo_edit(argc, argv, envp)
      * and copy the contents of the original to it.
      */
     tf = emalloc2(argc - 1, sizeof(*tf));
-    memset(tf, 0, (argc - 1) * sizeof(*tf));
+    zero_bytes(tf, (argc - 1) * sizeof(*tf));
     for (i = 0, ap = argv + 1; i < argc - 1 && *ap != NULL; i++, ap++) {
        error = -1;
        set_perms(PERM_RUNAS);
        if ((ofd = open(*ap, O_RDONLY, 0644)) != -1 || errno == ENOENT) {
            if (ofd == -1) {
-               memset(&sb, 0, sizeof(sb));             /* new file */
+               zero_bytes(&sb, sizeof(sb));            /* new file */
                error = 0;
            } else {
 #ifdef HAVE_FSTAT

diff --git a/tgetpass.c b/tgetpass.c
index 9f31c1727407d30be93227caba461dff8812283c..119114867f08841277c268dd5930518ae1e44d4d 100644 (file)
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -177,8 +177,8 @@ restart:
 #endif
        (void) tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
     } else {
-       memset(&term, 0, sizeof(term));
-       memset(&oterm, 0, sizeof(oterm));
+       zero_bytes(&term, sizeof(term));
+       zero_bytes(&oterm, sizeof(oterm));
     }
 
     /* No output if we are already backgrounded. */

diff --git a/tsgetgrpw.c b/tsgetgrpw.c
index 67a8d3268b27545708bff04a171f7fcda5befe21..217527d85703994d1492870dfa3596f2f6ab4141 100644 (file)
--- a/tsgetgrpw.c
+++ b/tsgetgrpw.c
@@ -118,7 +118,7 @@ ts_getpwent()
     if ((colon = fgets(pwbuf, sizeof(pwbuf), pwf)) == NULL)
        return(NULL);
 
-    memset(&pw, 0, sizeof(pw));
+    zero_bytes(&pw, sizeof(pw));
     if ((colon = strchr(cp = colon, ':')) == NULL)
        return(NULL);
     *colon++ = '\0';
@@ -233,7 +233,7 @@ ts_getgrent()
     if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL)
        return(NULL);
 
-    memset(&gr, 0, sizeof(gr));
+    zero_bytes(&gr, sizeof(gr));
     if ((colon = strchr(cp = colon, ':')) == NULL)
        return(NULL);
     *colon++ = '\0';