From: Simon McVittie <smcv@collabora.com>
Date: Tue, 16 Jan 2018 12:23:06 +0000 (+0000)
Subject: _dbus_credentials_add_from_user: Check return of add_unix_uid
X-Git-Tag: dbus-1.13.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb6b6b2bc334f2af9708715378bdbec382aa1fb0;p=thirdparty%2Fdbus.git

_dbus_credentials_add_from_user: Check return of add_unix_uid

Coverity CID 253543.

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

diff --git a/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index e765e7945..01bb0b54e 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -540,8 +540,15 @@ _dbus_credentials_add_from_user (DBusCredentials         *credentials,
     {
       _DBUS_STATIC_ASSERT (sizeof (uid) == sizeof (dbus_uid_t));
 
-      _dbus_credentials_add_unix_uid (credentials, uid);
-      return TRUE;
+      if (_dbus_credentials_add_unix_uid (credentials, uid))
+        {
+          return TRUE;
+        }
+      else
+        {
+          _DBUS_SET_OOM (error);
+          return FALSE;
+        }
     }
 
   /* If we aren't allowed to look in NSS or /etc/passwd, fail now. */