Comment 4 for bug 2067361

Hi Dan, thanks for taking a look.

I fixed the changelog entry on patch-V2.

Regarding the upstream commit 7f5ddb4a75fcb64046e3fc2af885960d2800a5b3, I think that cannot be be cherry-picked to a stable release as is, due to the added security check. While the security check makes sense, an affected user would see this as an error out of nowhere.

I've picked here only the changes required to avoid the parsing exception in an effort to meet the criteria for an "obviously safe patch", since with a smaller change it's easier to reason about the extent of possible effects.