[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
proposed getdelim.c patch to fix buffer overrun on 64-bit hosts
From: |
Paul Eggert |
Subject: |
proposed getdelim.c patch to fix buffer overrun on 64-bit hosts |
Date: |
Sun, 02 Oct 2005 15:55:54 -0700 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) |
Simon, is it OK if I install this into gnulib? I just installed it
into coreutils.
2005-10-02 Paul Eggert <address@hidden>
* getdelim.c: Include getdelim.h first. Include <limits.h>.
(SSIZE_MAX): New macro, if not already defined.
(getdelim): Fix buffer overrun on 64-bit hosts with lines longer
than 2 GiB.
--- lib/getdelim.c 1 Oct 2005 10:33:38 -0000 1.4
+++ lib/getdelim.c 2 Oct 2005 22:53:15 -0000
@@ -23,11 +23,15 @@
# include <config.h>
#endif
+#include "getdelim.h"
+
+#include <limits.h>
#include <stdlib.h>
#include <errno.h>
-#include "getdelim.h"
-
+#ifndef SSIZE_MAX
+# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#endif
#if !HAVE_FLOCKFILE
# undef flockfile
# define flockfile(x) ((void) 0)
@@ -46,8 +50,8 @@
ssize_t
getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
{
- int result = 0;
- ssize_t cur_len = 0;
+ ssize_t result;
+ size_t cur_len = 0;
if (lineptr == NULL || n == NULL || fp == NULL)
{
@@ -74,18 +78,22 @@ getdelim (char **lineptr, size_t *n, int
i = getc (fp);
if (i == EOF)
- {
- result = -1;
- break;
- }
+ {
+ result = -1;
+ break;
+ }
/* Make enough space for len+1 (for final NUL) bytes. */
if (cur_len + 1 >= *n)
{
- size_t needed = 2 * (cur_len + 1) + 1; /* Be generous. */
+ size_t needed_max =
+ SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+ size_t needed = 2 * *n + 1; /* Be generous. */
char *new_lineptr;
- if (needed < cur_len)
+ if (needed_max < needed)
+ needed = needed_max;
+ if (cur_len + 1 >= needed)
{
result = -1;
goto unlock_return;
- proposed getdelim.c patch to fix buffer overrun on 64-bit hosts,
Paul Eggert <=