Fix null pointer exception in user_ldap

butonic · DeepDiver1975 · commit c0bbbd6d11f3 · 2016-06-21T11:48:40.000+02:00
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -732,7 +732,14 @@ public function batchApplyUserAttributes(array $ldapRecords){
 				$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']
+				);
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -732,7 +732,14 @@ public function batchApplyUserAttributes(array $ldapRecords){`
`732`	`732`	`$user->unmark();`
`733`	`733`	`$user = $this->userManager->get($ocName);`
`734`	`734`	`}`
`735`		`- $user->processAttributes($userRecord);`
	`735`	`+ if ($user !== null) {`
	`736`	`+ $user->processAttributes($userRecord);`
	`737`	`+ } else {`
	`738`	`+ \OC::$server->getLogger()->debug(`
	`739`	`+ "The ldap user manager returned null for $ocName",`
	`740`	`+ ['app'=>'user_ldap']`
	`741`	`+ );`
	`742`	`+ }`
`736`	`743`	`}`
`737`	`744`	`}`
`738`	`745`