]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
bus_driver_handle_get_connection_credentials: do not assert on OOM
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 11 Feb 2015 13:14:24 +0000 (13:14 +0000)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 11 Feb 2015 15:26:16 +0000 (16:26 +0100)
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
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
bus/driver.c

index 83040669ced45392ddec880428e938ca02dc6c6e..e82602bcfab3fc7f362fd21b5a64a19004b72cfc 100644 (file)
@@ -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);