Module Name: src
Committed By: roy
Date: Wed Dec 2 11:14:47 UTC 2009
Modified Files:
src/lib/libc/stdio: getdelim.c
Log Message:
Pass lint.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/stdio/getdelim.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/getdelim.c
diff -u src/lib/libc/stdio/getdelim.c:1.10 src/lib/libc/stdio/getdelim.c:1.11
--- src/lib/libc/stdio/getdelim.c:1.10 Wed Dec 2 09:03:13 2009
+++ src/lib/libc/stdio/getdelim.c Wed Dec 2 11:14:47 2009
@@ -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;
