Skip to content
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.

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

Ensure that we don't merge broken json. #18288

Merged
merged 2 commits into from
Dec 9, 2019
Merged

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Dec 8, 2019

Fix #18277

How to test? Create config/mimetypemapping.json with:

{
	"kdbx": ["application/x-kdbx],
}

https://3v4l.org/N3hms array_merge([], null); will be null.

@kesselb kesselb added this to the Nextcloud 18 milestone Dec 8, 2019
@kesselb kesselb force-pushed the bug/18277/catch-json-errors branch 2 times, most recently from 59f7d62 to 54f39e5 Compare December 8, 2019 21:17
Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow nice!!

lib/private/Files/Type/Detection.php Outdated Show resolved Hide resolved
lib/private/Files/Type/Detection.php Outdated Show resolved Hide resolved
lib/private/Files/Type/Detection.php Outdated Show resolved Hide resolved
@kesselb
Copy link
Contributor Author

kesselb commented Dec 9, 2019

Done @nickvergessen @ChristophWurst

@rullzer rullzer merged commit 962a51e into master Dec 9, 2019
@rullzer rullzer deleted the bug/18277/catch-json-errors branch December 9, 2019 14:18
@rullzer rullzer mentioned this pull request Dec 11, 2019
43 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A new kind of failure when upgrading to 17 from 16, NULL page loads where Start Update should.
5 participants