[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl
From: |
shishi-commit |
Subject: |
CVS shishi/gl |
Date: |
Fri, 17 Sep 2004 01:18:43 +0200 |
Update of /home/cvs/shishi/gl
In directory dopio:/tmp/cvs-serv17721/gl
Modified Files:
vasnprintf.c vasprintf.c
Log Message:
Update.
--- /home/cvs/shishi/gl/vasnprintf.c 2004/07/02 09:19:40 1.7
+++ /home/cvs/shishi/gl/vasnprintf.c 2004/09/16 23:18:43 1.8
@@ -40,7 +40,7 @@
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
-#include <limits.h> /* CHAR_BIT */
+#include <limits.h> /* CHAR_BIT, INT_MAX */
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
#if WIDE_CHAR_VERSION
# include "wprintf-parse.h"
@@ -862,8 +862,19 @@
free (buf_malloced);
CLEANUP ();
*lengthp = length;
+ if (length > INT_MAX)
+ goto length_overflow;
return result;
+ length_overflow:
+ /* We could produce such a big string, but its length doesn't fit into
+ an 'int'. POSIX says that snprintf() fails with errno = EOVERFLOW in
+ this case. */
+ if (result != resultbuf)
+ free (result);
+ errno = EOVERFLOW;
+ return NULL;
+
out_of_memory:
if (!(result == resultbuf || result == NULL))
free (result);
--- /home/cvs/shishi/gl/vasprintf.c 2003/11/22 07:10:04 1.3
+++ /home/cvs/shishi/gl/vasprintf.c 2004/09/16 23:18:43 1.4
@@ -1,5 +1,5 @@
/* Formatted output to strings.
- Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@
/* Specification. */
#include "vasprintf.h"
-#include <limits.h>
#include <stdlib.h>
#include "vasnprintf.h"
@@ -34,15 +33,10 @@
char *result = vasnprintf (NULL, &length, format, args);
if (result == NULL)
return -1;
- if (length > INT_MAX)
- {
- /* We could produce such a big string, but can't return its length
- as an 'int'. */
- free (result);
- return -1;
- }
*resultp = result;
- /* Return the number of resulting bytes, excluding the trailing NUL. */
+ /* Return the number of resulting bytes, excluding the trailing NUL.
+ If it wouldn't fit in an 'int', vasnprintf() would have returned NULL
+ and set errno to EOVERFLOW. */
return length;
}
- CVS shishi/gl, shishi-commit, 2004/09/03
- CVS shishi/gl, shishi-commit, 2004/09/08
- CVS shishi/gl, shishi-commit, 2004/09/09
- CVS shishi/gl,
shishi-commit <=
- CVS shishi/gl, shishi-commit, 2004/09/17
- CVS shishi/gl, shishi-commit, 2004/09/17
- CVS shishi/gl, shishi-commit, 2004/09/17