From 5ccd36cecb91b55c30626d84db4967bf64b8aceb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 12 Jul 2018 13:32:10 +0100 Subject: [PATCH] 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 Reviewed-by: Philip Withnall Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107194 (cherry picked from commit 294e8b0b672c8ffdcb8d9227f114846433659864) --- dbus/dbus-nonce.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c index eab23f642..00255d392 100644 --- a/dbus/dbus-nonce.c +++ b/dbus/dbus-nonce.c @@ -367,7 +367,7 @@ do_noncefile_create (DBusNonceFile *noncefile, 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); -- 2.47.3