diff options
| author | truckman <truckman@FreeBSD.org> | 2016-05-23 05:45:52 +0000 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2016-05-23 05:45:52 +0000 |
| commit | 4e814823537e7ffd6230dccf8938e63eee13cb7b (patch) | |
| tree | 790cd794d4123e6d30de0574fd1098423c53153c /usr.bin | |
| parent | d2f0c2e323a119da1b163f37f922e1edd5d2f84c (diff) | |
| download | FreeBSD-src-4e814823537e7ffd6230dccf8938e63eee13cb7b.zip FreeBSD-src-4e814823537e7ffd6230dccf8938e63eee13cb7b.tar.gz | |
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
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ncal/ncal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 48b8c1a..5a5cbc3 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -642,8 +642,8 @@ monthrangeb(int y, int m, int jd_flag, int before, int after) 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; |
