Add bounds check to resolve buffer over-read #1040
Merged
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
Fixes JACoders#1038 ofst over-reads past the end of the pSoundData buffer. Add a bounds check similar to S_CheckAmplitude() in codemp/client/snd_dma.cpp. JACoders@69800e8
namtsui
force-pushed
the
buffer-over-read-fix
branch
from
a7d56de
to
4472fa8
Compare
|
Thanks for the PR! I think a better place to fix this is here: Before the code calls Then we have the correct number of samples to add from the start and don't need to perform a comparison every sample loop |
Sounds that use dopplerScale (e.g., rocket launcher) exhibited a buffer over-read. S_PaintChannelFrom16's ofst reads past end of sfx->pSoundData buffer. To resolve this, take dopplerScale increments of ofst into consideration when calculating count, which controls the loop for ofst. Resolves: JACoders#1038 See also: JACoders@69800e8
|
That seems like a better place to put it. Please test this to make sure I did not break the doppler effect when shooting a rocket launcher. It works in my testing with ten runs of shooting the rocket launcher. |
|
I'm unable to test right now but the code looks correct and I'll trust your testing went fine :) |
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 #1038
ofst over-reads past the end of the pSoundData buffer. Add a bounds check
similar to S_CheckAmplitude() in codemp/client/snd_dma.cpp.
69800e8