Fix undefined memcpy in AudioStreamWAV::get_data()
#97790
Closed
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
AThousandShips
added
the
cherrypick:4.3
hpvb
requested changes
Dec 15, 2024
| @@ -584,7 +584,7 @@ void AudioStreamWAV::set_data(const Vector<uint8_t> &p_data) { | |||
| Vector<uint8_t> AudioStreamWAV::get_data() const { | |||
| Vector<uint8_t> pv; | |||
|
|
|||
| if (!data.is_empty()) { | |||
| if (data_bytes != 0) { | |||
There was a problem hiding this comment.
The surrounding code uses if (x) this should probably be changed to match.
adamscott
changed the title
memcpy in AudioStreamWAV::get_data()
|
Superseded by #100422 (mostly for the impressive writeup which is worth merging for the legacy), but we've added you as co-author to that PR since you independently came up with the same fix. Apologies for not reviewing it in time, while it was obviously correct in hindsight. Thanks for the contribution! |
akien-mga
added
archived
and removed
cherrypick:4.3
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.
Fixes #97720. In the get_data() function of the AudioStreamWAV, memcpy is called on an undefined pointer due to assuming there is data after some padding bytes (which isn't true for an empty buffer). This was fixed by checking if there is actually any data to copy instead of checking if the buffer (including padding) is not empty (which should never be true).