Author: truckman
Date: Fri May 20 06:05:20 2016
New Revision: 300266
URL: https://svnweb.freebsd.org/changeset/base/300266

Log:
  MFC r299525
  
    Use strlcpy() instead of strncpy() when copying date and subj
    to ensure that these are properly NUL terminated since they
    are passed to printf().
  
  Reported by:  Coverity
  CID:          974770

Modified:
  stable/10/usr.bin/msgs/msgs.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/msgs/msgs.c
==============================================================================
--- stable/10/usr.bin/msgs/msgs.c       Fri May 20 06:02:44 2016        
(r300265)
+++ stable/10/usr.bin/msgs/msgs.c       Fri May 20 06:05:20 2016        
(r300266)
@@ -855,7 +855,7 @@ gfrsub(FILE *infile)
                        }
                        *ptr = '\0';
                        if (*(in = nxtfld(in)))
-                               strncpy(date, in, sizeof date);
+                               strlcpy(date, in, sizeof date);
                        else {
                                date[0] = '\n';
                                date[1] = '\0';
@@ -886,7 +886,7 @@ gfrsub(FILE *infile)
                if (!seensubj && strncmp(inbuf, "Subj", 4)==0) {
                        seensubj = YES;
                        frompos = ftello(infile);
-                       strncpy(subj, nxtfld(inbuf), sizeof subj);
+                       strlcpy(subj, nxtfld(inbuf), sizeof subj);
                }
        }
        if (!blankline)
@@ -899,7 +899,7 @@ gfrsub(FILE *infile)
                /*
                 * for possible use with Mail
                 */
-               strncpy(subj, "(No Subject)\n", sizeof subj);
+               strlcpy(subj, "(No Subject)\n", sizeof subj);
 }
 
 static char *
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to