mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9 

[stable9] Fix null pointer exception in user_ldap
This commit is contained in:
Vincent Petry 2016-06-21 16:10:48 +02:00 committed by GitHub
parent ddd4f367c3 11c1d399af
commit 54209abb74
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/user_ldap/lib/access.php
View File

@ -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']
);
}
}
}