skip malformed entries in parse_device_configurations#1979
Open
aizu-m wants to merge 1 commit into
Open
Conversation
|
Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build. |
1 similar comment
|
Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build. |
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.
Chasing why a valid device_configuration silently vanished, I put one good entry in front of a malformed one in vk_loader_settings.json and watched the enumerate call:
parse_device_configurations in loader/settings.c sets device_configuration_count to the JSON array size before the loop, then uses
continueto skip entries that fail to parse. Two things go wrong from there.The count is never lowered to the number of entries that actually parsed, so skipped slots stay zero-initialised yet are still walked later by loader_apply_settings_device_configurations. And a skipped entry leaves
resat VK_ERROR_INITIALIZATION_FAILED, so when the malformed entry happens to be the last one, the cleanup at out: frees the whole array and zeroes the count, taking the valid entries with it. The count query in terminator_EnumeratePhysicalDevices then reports 0.The settings file is untrusted input, so one trailing typo empties the device list.
Reset
resin the skip path so a bad entry no longer poisons the good ones, and set the count to the number that parsed. Behaviour for all-valid files is unchanged. Regression test added to loader_settings_tests.cpp.