diff options
| author | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-03 22:09:10 +0000 |
|---|---|---|
| committer | tkoenig <tkoenig@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-03 22:09:10 +0000 |
| commit | 0e80ec22c1008e63b1f553ec6287457d834534ae (patch) | |
| tree | 7c1981a62b5a05fcb566b6985611348493c6918d /libgfortran | |
| parent | c43db9ece6d4baee5a8afe1e8cb4f844974a6504 (diff) | |
| download | gcc-0e80ec22c1008e63b1f553ec6287457d834534ae.tar.gz | |
2007-08-03 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/32977
* io/unix.c: If there is no vsnprintf, use vsprintf and issue
a fatal error when a buffer overrun occurs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127187 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/io/unix.c | 19 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index eb03d0ad688..2ccb46b02dd 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2007-08-03 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR libfortran/32977 + * io/unix.c: If there is no vsnprintf, use vsprintf and issue + a fatal error when a buffer overrun occurs. + 2007-08-03 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/31202 diff --git a/libgfortran/io/unix.c b/libgfortran/io/unix.c index e9ad164ba96..75721cc2ff5 100644 --- a/libgfortran/io/unix.c +++ b/libgfortran/io/unix.c @@ -1386,7 +1386,8 @@ error_stream (void) overruns, we limit the length of the buffer to ST_VPRINTF_SIZE. 2k is big enough to completely fill a 80x25 terminal, so it shuld be OK. We use a direct write() because it is simpler and least likely - to be clobbered by memory corruption. */ + to be clobbered by memory corruption. Writing an error message + longer than that is an error. */ #define ST_VPRINTF_SIZE 2048 @@ -1401,8 +1402,22 @@ st_vprintf (const char *format, va_list ap) #ifdef HAVE_VSNPRINTF written = vsnprintf(buffer, ST_VPRINTF_SIZE, format, ap); #else - written = __builtin_vsnprintf(buffer, ST_VPRINTF_SIZE, format, ap); + written = vsprintf(buffer, format, ap); + + if (written >= ST_VPRINTF_SIZE-1) + { + /* The error message was longer than our buffer. Ouch. Because + we may have messed up things badly, report the error and + quit. */ +#define ERROR_MESSAGE "Internal error: buffer overrun in st_vprintf()\n" + write (fd, buffer, ST_VPRINTF_SIZE-1); + write (fd, ERROR_MESSAGE, strlen(ERROR_MESSAGE)); + sys_exit(2); +#undef ERROR_MESSAGE + + } #endif + written = write (fd, buffer, written); return written; } |