Skip to content

Prevent crash when setting empty uniform array #3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 1, 2024
Merged

Prevent crash when setting empty uniform array #3186

merged 1 commit into from
Aug 1, 2024

Conversation

@ChrisThrasher
Copy link
Member

@ChrisThrasher ChrisThrasher commented Jul 31, 2024

Description

Closes #3185
@ChrisThrasher ChrisThrasher added this to the 3.0 milestone Jul 31, 2024
@ChrisThrasher ChrisThrasher mentioned this pull request Jul 31, 2024
Closed
3 tasks
@ChrisThrasher ChrisThrasher changed the base branch from master to 2.6.x July 31, 2024 18:13
@ChrisThrasher
Copy link
Member Author

ChrisThrasher commented Jul 31, 2024

Retargeting 2.6.x since this crash does not apparently occur in v3.
@coveralls
Copy link
Collaborator

coveralls commented Jul 31, 2024

Pull Request Test Coverage Report for Build 10184599476

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.03%) to 55.755%
Totals Coverage Status
Change from base Build 10183097761: -0.03%
Covered Lines: 11668
Relevant Lines: 19685
💛 - Coveralls
@kimci86
Copy link
Contributor

kimci86 commented Jul 31, 2024 •
edited
Loading

I think the fix could be as simple as replacing &contiguous[0] by length ? &contiguous[0] : NULL.

We use this pattern in other places like here:

SFML/src/SFML/Network/Packet.cpp

Line 85 in 779b963

return !m_data.empty() ? &m_data[0] : NULL;

@ChrisThrasher
Prevent crash when setting empty uniform array
d7541cb 
The root of the problem is accessing the first element of an empty
array which reads out-of-bounds memory.
@ChrisThrasher
Copy link
Member Author

ChrisThrasher commented Aug 1, 2024

The author of #3185 confirmed that this PR fixes their problem and that their problem is not present in SFML 3 so this commit does not need to be backmerged into master.
@ChrisThrasher ChrisThrasher merged commit 2a4ca6e into 2.6.x Aug 1, 2024
@ChrisThrasher ChrisThrasher deleted the setUniformArray branch August 1, 2024 20:04
@eXpl0it3r eXpl0it3r modified the milestones: 3.0, 2.6.2 Aug 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug m:sfml-graphics

6 participants

@ChrisThrasher @coveralls @kimci86 @binary1248 @eXpl0it3r