From 624c694c7b6fc4c7d38b992378700349c7477708 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 11 Feb 2015 13:14:24 +0000
Subject: [PATCH 1/5] bus_driver_handle_get_connection_credentials: do not
 assert on OOM

dbus_connection_get_windows_user is documented to return TRUE but
put NULL in its argument if OOM is reached.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89041
---
 bus/driver.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bus/driver.c b/bus/driver.c
index 8304066..e82602b 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -1686,6 +1686,10 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection,
     {
       DBusString str;
       dbus_bool_t result;
+
+      if (windows_sid == NULL)
+        goto oom;
+
       _dbus_string_init_const (&str, windows_sid);
       result = _dbus_validate_utf8 (&str, 0, _dbus_string_get_length (&str));
       _dbus_string_free (&str);
-- 
2.1.4