projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ListNames and ListQueuedOwners updated to work with new kdbus
[platform/upstream/dbus.git]
/
dbus
/
dbus-nonce.c
diff --git
a/dbus/dbus-nonce.c
b/dbus/dbus-nonce.c
index
e74c2dd
..
ef037ef
100644
(file)
--- a/
dbus/dbus-nonce.c
+++ b/
dbus/dbus-nonce.c
@@
-240,6
+240,7
@@
do_noncefile_create (DBusNonceFile *noncefile,
dbus_bool_t use_subdir)
{
DBusString randomStr;
dbus_bool_t use_subdir)
{
DBusString randomStr;
+ const char *tmp;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
@@
-257,8
+258,11
@@
do_noncefile_create (DBusNonceFile *noncefile,
goto on_error;
}
goto on_error;
}
+ tmp = _dbus_get_tmpdir ();
+
if (!_dbus_string_init (&noncefile->dir)
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;
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
goto on_error;