Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull up following revision(s) (requested by roy in ticket #936): 

lib/libterminfo/curterm.c: revision 1.14

terminfo: test strlcpy result against space free, not string length

riastradh@ yep, looks good.
This commit is contained in:
martin 2020-05-31 10:41:39 +00:00
parent 063ac96024
commit f5501c22a9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libterminfo/curterm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: curterm.c,v 1.13 2017/05/04 09:42:23 roy Exp $ */
/* $NetBSD: curterm.c,v 1.13.12.1 2020/05/31 10:41:39 martin Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: curterm.c,v 1.13 2017/05/04 09:42:23 roy Exp $");
__RCSID("$NetBSD: curterm.c,v 1.13.12.1 2020/05/31 10:41:39 martin Exp $");
#include <assert.h>
#include <stdlib.h>
@ -99,21 +99,21 @@ set_curterm(TERMINAL *nterm)
p = ttytype;
l = sizeof(ttytype);
if ((n = strlcpy(p, nterm->name, l)) == strlen(p)) {
if ((n = strlcpy(p, nterm->name, l)) < l) {
p += n;
l -= n;
*p++ = '|';
l--;
if (nterm->_alias &&
(n = strlcpy(p, nterm->_alias, l)) == strlen(p))
if (nterm->_alias != NULL &&
(n = strlcpy(p, nterm->_alias, l)) < l)
{
p += n;
l -= n;
*p++ = '|';
l--;
}
if (nterm->desc &&
(n = strlcpy(p, nterm->desc, l)) == strlen(p))
if (nterm->desc != NULL &&
(n = strlcpy(p, nterm->desc, l)) < l)
{
p += n;
l -= n;