diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-21 16:10:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-21 16:10:48 +0200 |
| commit | 54209abb749cd2db9ffaca7a5c438c0172305dd1 (patch) | |
| tree | d523071b0b8d822cea05f7b3844e19bb324ce34a /apps | |
| parent | ddd4f367c30114a22bab875408dbbc54388a6767 (diff) | |
| parent | 11c1d399afa1a18e817482b38eb9aeb4d6492b53 (diff) | |
| download | nextcloud-server-54209abb749cd2db9ffaca7a5c438c0172305dd1.tar.gz nextcloud-server-54209abb749cd2db9ffaca7a5c438c0172305dd1.zip | |
Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9
[stable9] 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'] + ); + } } } |