From owner-svn-src-all@freebsd.org Fri May 20 06:05:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9556B416E3; Fri, 20 May 2016 06:05:21 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A4BA1BE4; Fri, 20 May 2016 06:05:21 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4K65KFU075066; Fri, 20 May 2016 06:05:20 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4K65KVa075065; Fri, 20 May 2016 06:05:20 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201605200605.u4K65KVa075065@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Fri, 20 May 2016 06:05:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r300266 - stable/10/usr.bin/msgs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2016 06:05:21 -0000 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 *