From: Jörn Friedrich Dreyer <jfd@butonic.de>
Date: Tue, 21 Jun 2016 14:30:48 +0000 (+0200)
Subject: Fix null pointer exception in user_ldap (#25062)
X-Git-Tag: v9.1.0RC1~41
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=704a993e37fc02b4dda0f0e683af4c9572ed51c7;p=nextcloud-server.git

Fix null pointer exception in user_ldap (#25062)
---

diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index daeb7d942a4..4d0753696ff 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -732,7 +732,14 @@ class Access extends LDAPUtility implements IUserTools {
 				$user->unmark();
 				$user = $this->userManager->get($ocName);
 			}
-			$user->processAttributes($userRecord);
+			if ($user !== null) {
+				$user->processAttributes($userRecord);
+			} else {
+				\OC::$server->getLogger()->debug(
+					"The ldap user manager returned null for $ocName",
+					['app'=>'user_ldap']
+				);
+			}
 		}
 	}