Attachment 43657 Details for Bug 34569 – DBusNonceFile: don't always fail when use_subdir=TRUE, i.e. on Unix

[patch] DBusNonceFile: don't always fail when use_subdir=TRUE, i.e. on Unix

0001-DBusNonceFile-don-t-always-fail-when-use_subdir-TRUE.patch (text/plain), 1.31 KB, created by Simon McVittie on 2011-02-22 06:02:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-22 06:02:10 UTC

Size: 1.31 KB

patch

obsolete

>From 704ebb9b9ca907b34a9f3cd1213575f0e4498732 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 22 Feb 2011 13:42:46 +0000
>Subject: [PATCH] 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.
>---
> 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 d7cee64..d30b253 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;
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 34569: 43657 | 44313

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.