Merge pull request #31655 from nextcloud/fix-passing-null-to-strlen

Fix passing null to strlen
nextcloud · Mar 24, 2022 · fbf1334 · fbf1334
2 parents c9ea236 + 0456f61
commit fbf1334
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php
@@ -107,7 +107,7 @@ public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offs
 		}
 
 		$allContacts = $this->contactsManager->search(
-			$filter ?: '',
+			$filter ?? '',
 			[
 				'FN',
 				'EMAIL'
@@ -146,7 +146,7 @@ public function getContacts(IUser $user, $filter, ?int $limit = null, ?int $offs
 	 *
 	 * @param IUser $self
 	 * @param Entry[] $entries
-	 * @param string $filter
+	 * @param string|null $filter
 	 * @return Entry[] the filtered contacts
 	 */
 	private function filterContacts(

diff --git a/lib/private/Contacts/ContactsMenu/Manager.php b/lib/private/Contacts/ContactsMenu/Manager.php
@@ -59,14 +59,14 @@ public function __construct(ContactsStore $store, ActionProviderStore $actionPro
 
 	/**
 	 * @param IUser $user
-	 * @param string $filter
+	 * @param string|null $filter
 	 * @return array
 	 */
 	public function getEntries(IUser $user, $filter) {
 		$maxAutocompleteResults = max(0, $this->config->getSystemValueInt('sharing.maxAutocompleteResults', Constants::SHARING_MAX_AUTOCOMPLETE_RESULTS_DEFAULT));
 		$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
 		$topEntries = [];
-		if (strlen($filter) >= $minSearchStringLength) {
+		if (strlen($filter ?? '') >= $minSearchStringLength) {
 			$entries = $this->store->getContacts($user, $filter, $maxAutocompleteResults);
 
 			$sortedEntries = $this->sortEntries($entries);