From 83f0769a351024b5d686168f78900e769d64a2c3 Mon Sep 17 00:00:00 2001 From: simonmar Date: Thu, 12 Jan 2006 12:41:03 +0000 Subject: [PATCH] [project @ 2006-01-12 12:41:03 by simonmar] time_str: - use ctime_r if available - avoid use of strcpy on overlapping regions Ticket #480 (patch modified by me) --- ghc/rts/RtsUtils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc/rts/RtsUtils.c b/ghc/rts/RtsUtils.c index b54d3da..ef7cbb7 100644 --- a/ghc/rts/RtsUtils.c +++ b/ghc/rts/RtsUtils.c @@ -189,9 +189,13 @@ time_str(void) if (now == 0) { time(&now); +#if HAVE_CTIME_R + ctime_r(&now, nowstr); +#else strcpy(nowstr, ctime(&now)); - strcpy(nowstr+16,nowstr+19); - nowstr[21] = '\0'; +#endif + memmove(nowstr+16,nowstr+19,7); + nowstr[21] = '\0'; // removes the \n } return nowstr; } -- 1.7.10.4