diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2016-06-21 16:30:48 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-06-21 16:30:48 +0200 |
| commit | 704a993e37fc02b4dda0f0e683af4c9572ed51c7 (patch) | |
| tree | 570c7c86cd577a7abb5a578a59764b3dd4469f28 /apps/user_ldap/lib | |
| parent | 755c86e3a2bf04f976779bf86170462bef392639 (diff) | |
| download | nextcloud-server-704a993e37fc02b4dda0f0e683af4c9572ed51c7.tar.gz nextcloud-server-704a993e37fc02b4dda0f0e683af4c9572ed51c7.zip | |
Fix null pointer exception in user_ldap (#25062)
Diffstat (limited to 'apps/user_ldap/lib')
| -rw-r--r-- | apps/user_ldap/lib/Access.php | 9 |
1 files changed, 8 insertions, 1 deletions
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'] + ); + } } } |