public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-9937] libgfortran: Fix compilation of gf_vsnprintf
@ 2024-04-12 11:52 François-Xavier Coudert
0 siblings, 0 replies; only message in thread
From: François-Xavier Coudert @ 2024-04-12 11:52 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:3bd3ca05b519b99b5ea570c10fd80737cd4c6c49
commit r14-9937-g3bd3ca05b519b99b5ea570c10fd80737cd4c6c49
Author: Ian McInerney <i.mcinerney17@imperial.ac.uk>
Date: Thu Apr 4 16:16:32 2024 +0100
libgfortran: Fix compilation of gf_vsnprintf
The fallback function (gf_vsnprintf) to provide a vsnprintf function
if the system library doesn't have one would not compile due to the
variable name for the string's destination buffer not being updated
after the refactor in 2018 in edaaef601d0d6d263fba87b42d6d04c99dd23dba.
This updates the internal logic of gf_vsnprintf to now use the str
variable defined in the function signature.
libgfortran/ChangeLog:
2024-04-04 Ian McInerney <i.mcinerney17@imperial.ac.uk>
* runtime/error.c (gf_vsnprintf): Fix compilation
Signed-off-by: Ian McInerney <i.mcinerney17@imperial.ac.uk>
Diff:
---
libgfortran/runtime/error.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libgfortran/runtime/error.c b/libgfortran/runtime/error.c
index e840f539599..044298294d8 100644
--- a/libgfortran/runtime/error.c
+++ b/libgfortran/runtime/error.c
@@ -142,15 +142,15 @@ gf_vsnprintf (char *str, size_t size, const char *format, va_list ap)
{
int written;
- written = vsprintf(buffer, format, ap);
+ written = vsprintf(str, format, ap);
if (written >= size - 1)
{
- /* The error message was longer than our buffer. Ouch. Because
+ /* The error message was longer than the string size. Ouch. Because
we may have messed up things badly, report the error and
quit. */
-#define ERROR_MESSAGE "Internal error: buffer overrun in gf_vsnprintf()\n"
- write (STDERR_FILENO, buffer, size - 1);
+#define ERROR_MESSAGE "Internal error: string overrun in gf_vsnprintf()\n"
+ write (STDERR_FILENO, str, size - 1);
write (STDERR_FILENO, ERROR_MESSAGE, strlen (ERROR_MESSAGE));
sys_abort ();
#undef ERROR_MESSAGE
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-12 11:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-12 11:52 [gcc r14-9937] libgfortran: Fix compilation of gf_vsnprintf François-Xavier Coudert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).