Repository navigation
[1.0] fix: Harden configuration parsing for nested settings - #320
Merged
Merged
Conversation
skazantsev
marked this pull request as ready for review
October 23, 2026 13:20
akoreman
approved these changes
Oct 23, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of Changes
Backport an upstream VS Code fix that hardens how nested objects in configuration files are parsed. Adds a common quilt patch to all targets and registers it in
patches/backported-patches.json.Adapted to Code-OSS 1.101.2: the parser there has no excluded-property filtering, so that part of the upstream change is dropped. The recursive walk is otherwise the same.
Remove the patch when Code-OSS is updated to >= 1.136.2.
Testing
prepare-src.shapplies cleanly on all 4 targets.configurationModels.test.tspasses on the patched source (81 passing, including the new upstream tests); the new upstream tests fail without the patch.security-scan.sh scan-github-advisoriesno longer reports the advisory.Build Code Editor Targetsdispatched on this branch.Backporting
Same change as #317 (1.2), #318 (main) and #319 (1.1).
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.