From owner-svn-src-stable-10@freebsd.org  Mon May 23 05:45:53 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 C96D3B467A9;
 Mon, 23 May 2016 05:45:53 +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 9952B1EBE;
 Mon, 23 May 2016 05:45:53 +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 u4N5jqIY094916;
 Mon, 23 May 2016 05:45:52 GMT (envelope-from truckman@FreeBSD.org)
Received: (from truckman@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4N5jqLc094915;
 Mon, 23 May 2016 05:45:52 GMT (envelope-from truckman@FreeBSD.org)
Message-Id: <201605230545.u4N5jqLc094915@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: truckman set sender to
 truckman@FreeBSD.org using -f
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 23 May 2016 05:45:52 +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: r300473 - stable/10/usr.bin/ncal
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 May 2016 05:45:53 -0000

Author: truckman
Date: Mon May 23 05:45:52 2016
New Revision: 300473
URL: https://svnweb.freebsd.org/changeset/base/300473

Log:
  MFC r300005
  
  swprintf() and apparently wcsftime() want the their output buffer size
  specified in terms of the the number of wide characters and not
  sizeof(buffer).
  
  Reported by:	Coverity
  CID:		1007605, 1007606

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

Modified: stable/10/usr.bin/ncal/ncal.c
==============================================================================
--- stable/10/usr.bin/ncal/ncal.c	Mon May 23 05:43:59 2016	(r300472)
+++ stable/10/usr.bin/ncal/ncal.c	Mon May 23 05:45:52 2016	(r300473)
@@ -642,8 +642,8 @@ monthrangeb(int y, int m, int jd_flag, i
 				wprintf(L"%-*ls  ",
 				    mw, wcenter(ws, year[i].name, mw));
 			else {
-				swprintf(ws, sizeof(ws), L"%-ls %d",
-				    year[i].name, M2Y(m + i));
+				swprintf(ws, sizeof(ws)/sizeof(ws[0]),
+				    L"%-ls %d", year[i].name, M2Y(m + i));
 				wprintf(L"%-*ls  ", mw, wcenter(ws1, ws, mw));
 			}
 		printf("\n");
@@ -958,7 +958,7 @@ mkweekdays(struct weekdays *wds)
 
 	for (i = 0; i != 7; i++) {
 		tm.tm_wday = (i+1) % 7;
-		wcsftime(buf, sizeof(buf), L"%a", &tm);
+		wcsftime(buf, sizeof(buf)/sizeof(buf[0]), L"%a", &tm);
 		for (len = 2; len > 0; --len) {
 			if ((width = wcswidth(buf, len)) <= 2)
 				break;