luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-22 08:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gutils: Make g_set_prgname() thread-safe

Browse Source 
Currently `g_prgname` can be freed by `g_set_prgname()` while another
thread is holding a pointer to it.

We use GQuark when setting g_prgname so that string is never released once set.
Also added unit test, which checks if setting prgname in multi-threaded
program is safe.

Closes: #847
This commit is contained in:
Nishal Kulkarni
2021-11-24 16:22:28 +05:30
parent 30c3f05532
commit ef4b43ff13
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gutils.c
View File

@@ -69,6 +69,7 @@
#include "garray.h"
#include "glibintl.h"
#include "gstdio.h"
#include "gquark.h"
#ifdef G_PLATFORM_WIN32
#include "gconvert.h"
@@ -1050,7 +1051,7 @@ g_get_host_name (void)
}
G_LOCK_DEFINE_STATIC (g_prgname);
static gchar *g_prgname = NULL;
static const gchar *g_prgname = NULL; /* always a quark */
/**
* g_get_prgname:
@@ -1071,7 +1072,7 @@ static gchar *g_prgname = NULL;
const gchar*
g_get_prgname (void)
{
gchar* retval;
const gchar* retval;
G_LOCK (g_prgname);
retval = g_prgname;
@@ -1093,14 +1094,16 @@ g_get_prgname (void)
* #GtkApplication::startup handler. The program name is found by
* taking the last component of @argv[0].
*
* Note that for thread-safety reasons this function can only be called once.
* Since GLib 2.72, this function can be called multiple times
* and is fully thread safe. Prior to GLib 2.72, this function
* could only be called once per process.
*/
void
g_set_prgname (const gchar *prgname)
{
GQuark qprgname = g_quark_from_string (prgname);
G_LOCK (g_prgname);
g_free (g_prgname);
g_prgname = g_strdup (prgname);
g_prgname = g_quark_to_string (qprgname);
G_UNLOCK (g_prgname);
}