Ensure VARIANT instances are actually VT_BSTR before treating them as such in OS_Windows::get_video_adapter_driver_info()#105548
Merged
Repiteo merged 1 commit intogodotengine:masterfrom Apr 22, 2025
Conversation
bruvzg
approved these changes
Apr 21, 2025
Contributor
|
Thanks! |
Contributor
Author
|
Can this be cherry-picked to older 4.X versions that have |
jss2a98aj
deleted the
windows-validate-VARIANT-in-get_video_adapter_driver_info
branch
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
4 participants
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.
Calling
OS.get_video_adapter_driver_info()can cause a crash or return garbage on Windows due to someVARIANTinstances not being checked to ensure they are actually set toVT_BSTR.Garbage data from an impacted system:
["䣀", "30.0.14.7411"]Results from the same system after adding checks:
["NVIDIA", "30.0.14.7411"]I have only seen this cause crashes or garbage outputs due to the the very first place that is checked not being a
VT_BSTR, but checking all areas it can happen in should ensure similar behavior will not happen again. In cases where no driver name and/or version would be given I have set the impacted string(s) to"Unknown". If this is undesired behavior I can adjust it to accommodate.