Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/stdio Pass lint.



details:   https://anonhg.NetBSD.org/src/rev/b75d4dce16be
branches:  trunk
changeset: 749547:b75d4dce16be
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Dec 02 11:14:47 2009 +0000

description:
Pass lint.

diffstat:

 lib/libc/stdio/getdelim.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r f16895d0388a -r b75d4dce16be lib/libc/stdio/getdelim.c
--- a/lib/libc/stdio/getdelim.c Wed Dec 02 10:18:42 2009 +0000
+++ b/lib/libc/stdio/getdelim.c Wed Dec 02 11:14:47 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: getdelim.c,v 1.10 2009/12/02 09:03:13 roy Exp $ */
+/* $NetBSD: getdelim.c,v 1.11 2009/12/02 11:14:47 roy Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: getdelim.c,v 1.10 2009/12/02 09:03:13 roy Exp $");
+__RCSID("$NetBSD: getdelim.c,v 1.11 2009/12/02 11:14:47 roy Exp $");
 
 #include "namespace.h"
 
@@ -90,12 +90,13 @@
                else
                        len = (p - fp->_p) + 1;
 
-               newlen = off + len + 1;
+               newlen = off + len;
                /* Ensure we can handle it */
-               if (newlen < off || newlen > (size_t)SSIZE_MAX + 1) {
+               if (newlen < off || newlen > SIZE_MAX) {
                        errno = EOVERFLOW;
                        goto error;
                }
+               newlen++; /* reserve space for the NULL terminator */
                if (newlen > *buflen) {
                        if (newlen < MINBUF)
                                newlen = MINBUF;



Home | Main Index | Thread Index | Old Index