frontend/widgets: Fix integer overflow #11922
Open
Conversation
This file contains 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
If the crop values combined are larger than the width or height of the source, an integer overflow will occur. This fix converts the width/height values to int, and then clamps any negative values to 0.
exeldro
reviewed
Mar 5, 2025
| @@ -419,8 +419,15 @@ static vec2 GetItemSize(obs_sceneitem_t *item) | |||
|
|
|||
| obs_sceneitem_get_scale(item, &scale); | |||
| obs_sceneitem_get_crop(item, &crop); | |||
| size.x = float(obs_source_get_width(source) - crop.left - crop.right) * scale.x; | |||
| size.y = float(obs_source_get_height(source) - crop.top - crop.bottom) * scale.y; | |||
| size.x = float((int)obs_source_get_width(source) - crop.left - crop.right) * scale.x; | |||
There was a problem hiding this comment.
the multiplying by scale should be moved after the check, because scale can be negative for flipped sources
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
If the crop values combined are larger than the width or height of the source, an integer overflow will occur.
This fix converts the width/height values to int, and then clamps any negative values to 0.
Fixes #11917
Motivation and Context
This was one of the root causes behind the freeze reported in #11917. Due to the integer overflow, it would essentially make the for loop in
DrawStripedLine()inOBSBasicPreview.cpprepeat nearly endlessly, which caused certain mutexes to stall (especially the scene video/audio mutexes). Because of that near-infinite loop, both the main and audio threads would stall until that near-indefinitely-stalled loop completed.How Has This Been Tested?
Tested according to the reproduction steps in #11917 and it no longer stalls.
Types of changes
Checklist: