diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-22 13:42:46 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-25 16:03:31 +0100 |
| commit | 54de9c060a701f046e717abd7c0e312da4182928 (patch) | |
| tree | e0219466cffd72fef1d7207b9568147b1bf1b614 | |
| parent | 4bcffe1e05cfc22eb29b41d39f7ceca14b45a9a8 (diff) | |
| download | dbus-54de9c060a701f046e717abd7c0e312da4182928.tar.gz | |
DBusNonceFile: don't always fail when use_subdir=TRUE, i.e. on Unix
In shell-like pseudocode, the desired result is:
if $use_subdir
dir = $tmpdir/dbus_nonce-$random
path = $dir/nonce
mkdir $dir
write file at $path
else
dir = $user_owned_place
path = $dir/dbus_nonce-$random
write file at $path
However, /nonce was accidentally appended to $dir instead of $path,
resulting in an attempt to mkdir /tmp/dbus_nonce-XXXX/nonce when
dbus_nonce-XXXX hadn't been created yet.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34569
Tested-by: David Zeuthen <davidz@redhat.com>
Reviewed-by: David Zeuthen <davidz@redhat.com>
| -rw-r--r-- | dbus/dbus-nonce.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c index d7cee64d..d30b2535 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -275,7 +275,7 @@ do_noncefile_create (DBusNonceFile *noncefile, } if (!_dbus_string_init (&noncefile->path) || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0) - || !_dbus_string_append (&noncefile->dir, "/nonce")) + || !_dbus_string_append (&noncefile->path, "/nonce")) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto on_error; |