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

sign-compare fix

Browse Source
This commit is contained in:
lukem 2009-02-05 05:39:38 +00:00
parent 5e1ba2f2e6
commit 38d40fc9f8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/ssp/fgets_chk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fgets_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $ */
/* $NetBSD: fgets_chk.c,v 1.6 2009/02/05 05:41:51 lukem Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: fgets_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $");
__RCSID("$NetBSD: fgets_chk.c,v 1.6 2009/02/05 05:41:51 lukem Exp $");
/*LINTLIBRARY*/
@ -48,7 +48,7 @@ __fgets_chk(char * __restrict buf, int len, size_t slen, FILE *fp)
if (slen >= (size_t)INT_MAX)
return fgets(buf, len, fp);
if (len >= 0 && len > slen)
if (len >= 0 && (size_t)len > slen)
__chk_fail();
return fgets(buf, len, fp);

6
lib/libc/ssp/sprintf_chk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $ */
/* $NetBSD: sprintf_chk.c,v 1.6 2009/02/05 05:40:36 lukem Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: sprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $");
__RCSID("$NetBSD: sprintf_chk.c,v 1.6 2009/02/05 05:40:36 lukem Exp $");
/*LINTLIBRARY*/
@ -54,7 +54,7 @@ __sprintf_chk(char * __restrict buf, int flags, size_t slen,
if (slen > (size_t)INT_MAX)
rv = vsprintf(buf, fmt, ap);
else {
if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && rv >= slen)
if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && (size_t)rv >= slen)
__chk_fail();
}
va_end(ap);

6
lib/libc/ssp/vsprintf_chk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vsprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $ */
/* $NetBSD: vsprintf_chk.c,v 1.6 2009/02/05 05:39:38 lukem Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: vsprintf_chk.c,v 1.5 2008/04/28 20:23:00 martin Exp $");
__RCSID("$NetBSD: vsprintf_chk.c,v 1.6 2009/02/05 05:39:38 lukem Exp $");
/*LINTLIBRARY*/
@ -52,7 +52,7 @@ __vsprintf_chk(char * __restrict buf, int flags, size_t slen,
if (slen > (size_t)INT_MAX)
rv = vsprintf(buf, fmt, ap);
else {
if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && rv >= slen)
if ((rv = vsnprintf(buf, slen, fmt, ap)) >= 0 && (size_t)rv >= slen)
__chk_fail();
}