Skip to content

Return a default user record if json is broken #17494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 2 commits into from
Dec 13, 2019
Merged

Return a default user record if json is broken #17494

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbe41a7
Return a default user record if json is broken
kesselb Oct 9, 2019
b97d90e
Log critical fallback to user default if we can't parse the JSON
ChristophWurst Dec 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Return a default user record if json is broken 
It's possible that json_decode returns null. Mostly the json is broken.
AddMissingDefaultValues expects an array. Pass null will fail.

Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb @ChristophWurst
kesselb authored and ChristophWurst committed Dec 13, 2019
commit bbe41a73dd0a77c572c78e9df8a77ff7b0cb7bf2
3 changes: 3 additions & 0 deletions lib/private/Accounts/AccountManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ public function getUser(IUser $user) {
}

$userDataArray = json_decode($result[0]['data'], true);
if ($userDataArray === null || json_last_error() !== JSON_ERROR_NONE) {
return $this->buildDefaultUserRecord($user);
}

$userDataArray = $this->addMissingDefaultValues($userDataArray);

Expand Down