fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 05:18:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

_dbus_get_tmpdir: be thread-safe

Browse source 
Sharing a static variable between threads is not safe in general,
and this function is used in the shared libdbus (for nonce files),
so it can't rely on being single-threaded.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2013-08-27 14:35:47 +01:00
parent ced50f8be1
commit d98a587f76
5 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bus/activation.c
View file

@ -2539,11 +2539,17 @@ dbus_bool_t
bus_activation_service_reload_test (const DBusString *test_data_dir)
{
DBusString directory;
const char *tmp;
if (!_dbus_string_init (&directory))
return FALSE;
if (!_dbus_string_append (&directory, _dbus_get_tmpdir()))
tmp = _dbus_get_tmpdir ();
if (tmp == NULL)
return FALSE;
if (!_dbus_string_append (&directory, tmp))
return FALSE;
if (!_dbus_string_append (&directory, "/dbus-reload-test-") ||

3
dbus/dbus-internals.h
View file

@ -316,9 +316,10 @@ typedef enum
_DBUS_LOCK_shutdown_funcs,
_DBUS_LOCK_system_users,
_DBUS_LOCK_message_cache,
/* index 10-11 */
/* index 10-12 */
_DBUS_LOCK_shared_connections,
_DBUS_LOCK_machine_uuid,
_DBUS_LOCK_sysdeps,
_DBUS_N_GLOBAL_LOCKS
} DBusGlobalLock;

6
dbus/dbus-nonce.c
View file

@ -240,6 +240,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
dbus_bool_t use_subdir)
{
DBusString randomStr;
const char *tmp;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
@ -257,8 +258,11 @@ do_noncefile_create (DBusNonceFile *noncefile,
goto on_error;
}
tmp = _dbus_get_tmpdir ();
if (!_dbus_string_init (&noncefile->dir)
|| !_dbus_string_append (&noncefile->dir, _dbus_get_tmpdir()))
|| tmp == NULL
|| !_dbus_string_append (&noncefile->dir, tmp))
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
goto on_error;

8
dbus/dbus-sysdeps-unix.c
View file

@ -3197,13 +3197,17 @@ _dbus_printf_string_upper_bound (const char *format,
* Gets the temporary files directory by inspecting the environment variables
* TMPDIR, TMP, and TEMP in that order. If none of those are set "/tmp" is returned
*
* @returns location of temp directory
* @returns location of temp directory, or #NULL if no memory for locking
*/
const char*
_dbus_get_tmpdir(void)
{
/* Protected by _DBUS_LOCK_sysdeps */
static const char* tmpdir = NULL;
if (!_DBUS_LOCK (sysdeps))
return NULL;
if (tmpdir == NULL)
{
/* TMPDIR is what glibc uses, then
@ -3226,6 +3230,8 @@ _dbus_get_tmpdir(void)
tmpdir = "/tmp";
}
_DBUS_UNLOCK (sysdeps);
_dbus_assert(tmpdir != NULL);
return tmpdir;

8
dbus/dbus-sysdeps-win.c
View file

@ -2256,14 +2256,18 @@ _dbus_generate_random_bytes (DBusString *str,
* Gets the temporary files directory by inspecting the environment variables
* TMPDIR, TMP, and TEMP in that order. If none of those are set "/tmp" is returned
*
* @returns location of temp directory
* @returns location of temp directory, or #NULL if no memory for locking
*/
const char*
_dbus_get_tmpdir(void)
{
/* Protected by _DBUS_LOCK_sysdeps */
static const char* tmpdir = NULL;
static char buf[1000];
if (!_DBUS_LOCK (sysdeps))
return NULL;
if (tmpdir == NULL)
{
char *last_slash;
@ -2285,6 +2289,8 @@ _dbus_get_tmpdir(void)
tmpdir = buf;
}
_DBUS_UNLOCK (sysdeps);
_dbus_assert(tmpdir != NULL);
return tmpdir;