luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib: avoid non-reentrant localtime() in g_log_writer_format_fields()

Browse Source
This commit is contained in:
Thomas Haller 2023-08-18 17:24:24 +02:00
parent 471188abdb
commit 84c9d887ee
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gmessages.c
View File

@ -186,22 +186,23 @@
#include <sys/uio.h> #include <sys/uio.h>
#endif #endif
#include "glib-init.h"
#include "galloca.h" #include "galloca.h"
#include "gbacktrace.h" #include "gbacktrace.h"
#include "gcharset.h" #include "gcharset.h"
#include "gconvert.h" #include "gconvert.h"
#include "genviron.h" #include "genviron.h"
#include "glib-init.h"
#include "glib-private.h" #include "glib-private.h"
#include "gmain.h" #include "gmain.h"
#include "gmem.h" #include "gmem.h"
#include "gpattern.h"
#include "gprintfint.h" #include "gprintfint.h"
#include "gtestutils.h"
#include "gthread.h"
#include "gstrfuncs.h" #include "gstrfuncs.h"
#include "gstring.h" #include "gstring.h"
#include "gpattern.h" #include "gtestutils.h"
#include "gthread.h"
#include "gthreadprivate.h" #include "gthreadprivate.h"
#include "gutilsprivate.h"
#if defined(__linux__) && !defined(__BIONIC__) #if defined(__linux__) && !defined(__BIONIC__)
#include "gjournal-private.h" #include "gjournal-private.h"
@ -2260,7 +2261,7 @@ g_log_writer_format_fields (GLogLevelFlags log_level,
GString *gstring; GString *gstring;
gint64 now; gint64 now;
time_t now_secs; time_t now_secs;
struct tm *now_tm; struct tm now_tm;
gchar time_buf[128]; gchar time_buf[128];
/* Extract some common fields. */ /* Extract some common fields. */
@ -2313,9 +2314,8 @@ g_log_writer_format_fields (GLogLevelFlags log_level,
/* Timestamp */ /* Timestamp */
now = g_get_real_time (); now = g_get_real_time ();
now_secs = (time_t) (now / 1000000); now_secs = (time_t) (now / 1000000);
now_tm = localtime (&now_secs); if (_g_localtime (now_secs, &now_tm))
if (G_LIKELY (now_tm != NULL)) strftime (time_buf, sizeof (time_buf), "%H:%M:%S", &now_tm);
strftime (time_buf, sizeof (time_buf), "%H:%M:%S", now_tm);
else else
strcpy (time_buf, "(error)"); strcpy (time_buf, "(error)");