diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2016-06-10 17:40:44 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-06-21 12:16:15 +0300 |
| commit | 11c1d399afa1a18e817482b38eb9aeb4d6492b53 (patch) | |
| tree | 52e80b618c895accf5a91849a762673cf4382eef /apps | |
| parent | 826654bb70c78bd577e71e0d75b5f2ecef6769ff (diff) | |
Fix null pointer exception in user_ldap
Diffstat (limited to 'apps')
| -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 f92ded64797..dd4aeee3b24 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -730,7 +730,14 @@ class Access extends LDAPUtility implements user\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'] + ); + } } } |