svn commit: r249698 - head/bin/df

[Ulrich Spoerlein]

Author: uqs
Date: Sat Apr 20 12:41:05 2013
New Revision: 249698
URL: http://svnweb.freebsd.org/changeset/base/249698

Log:
  bin/df: Fix unitialized use in prtstat
  
  While here:
  - use NULL in the context of pointers
  - use memset instead of bzero throughout the file
  - free memory to appease clang static analyzer
  
  Found by:     Coverity Scan (the UNINIT one)

Modified:
  head/bin/df/df.c

Modified: head/bin/df/df.c
==============================================================================
--- head/bin/df/df.c    Sat Apr 20 12:36:53 2013        (r249697)
+++ head/bin/df/df.c    Sat Apr 20 12:41:05 2013        (r249698)
@@ -114,6 +114,7 @@ main(int argc, char *argv[])
 
        fstype = "ufs";
        (void)setlocale(LC_ALL, "");
+       memset(&maxwidths, 0, sizeof(maxwidths));
        memset(&totalbuf, 0, sizeof(totalbuf));
        totalbuf.f_bsize = DEV_BSIZE;
        strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN);
@@ -200,7 +201,7 @@ main(int argc, char *argv[])
        } else {
                /* just the filesystems specified on the command line */
                mntbuf = malloc(argc * sizeof(*mntbuf));
-               if (mntbuf == 0)
+               if (mntbuf == NULL)
                        err(1, "malloc()");
                mntsize = 0;
                /* continued in for loop below */
@@ -209,13 +210,13 @@ main(int argc, char *argv[])
        /* iterate through specified filesystems */
        for (; *argv; argv++) {
                if (stat(*argv, &stbuf) < 0) {
-                       if ((mntpt = getmntpt(*argv)) == 0) {
+                       if ((mntpt = getmntpt(*argv)) == NULL) {
                                warn("%s", *argv);
                                rv = 1;
                                continue;
                        }
                } else if (S_ISCHR(stbuf.st_mode)) {
-                       if ((mntpt = getmntpt(*argv)) == 0) {
+                       if ((mntpt = getmntpt(*argv)) == NULL) {
                                mdev.fspec = *argv;
                                mntpath = strdup("/tmp/df.XXXXXX");
                                if (mntpath == NULL) {
@@ -282,7 +283,7 @@ main(int argc, char *argv[])
                mntbuf[mntsize++] = statfsbuf;
        }
 
-       bzero(&maxwidths, sizeof(maxwidths));
+       memset(&maxwidths, 0, sizeof(maxwidths));
        for (i = 0; i < mntsize; i++) {
                if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) {
                        update_maxwidths(&maxwidths, &mntbuf[i]);
@@ -295,6 +296,7 @@ main(int argc, char *argv[])
                        prtstat(&mntbuf[i], &maxwidths);
        if (cflag)
                prtstat(&totalbuf, &maxwidths);
+       free(mntbuf);
        return (rv);
 }
 
@@ -309,7 +311,7 @@ getmntpt(const char *name)
                if (!strcmp(mntbuf[i].f_mntfromname, name))
                        return (mntbuf[i].f_mntonname);
        }
-       return (0);
+       return (NULL);
 }
 
 /*
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"