From: Simon McVittie <smcv@collabora.com>
Date: Thu, 12 Jul 2018 12:32:10 +0000 (+0100)
Subject: nonce: Don't try to rmdir(NULL) on OOM
X-Git-Tag: dbus-1.13.6~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=294e8b0b672c8ffdcb8d9227f114846433659864;p=thirdparty%2Fdbus.git

nonce: Don't try to rmdir(NULL) on OOM

If re-initializing the string fails, it will be left in a state
where it has a length of 0 and a NULL buffer. That's valid to
"free", but not valid to pass to rmdir().

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194
---

diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index b56116b32..ef5eb617f 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -383,7 +383,7 @@ do_noncefile_create (DBusNonceFile **noncefile_out,
 
     return TRUE;
   on_error:
-    if (use_subdir)
+    if (use_subdir && _dbus_string_get_length (&noncefile->dir) != 0)
       _dbus_delete_directory (&noncefile->dir, NULL);
     _dbus_string_free (&noncefile->dir);
     _dbus_string_free (&noncefile->path);