diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-03-02 23:51:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 23:51:24 +0100 |
| commit | 56520d7bd60ae398d94af0ce2b0a80a9d1547255 (patch) | |
| tree | a758dc535f47f6ae498c857bfffc6a466c5196f1 /servers/audio_server.cpp | |
| parent | bf6398ae242cbaf90ff792d709d4727c8adc31ca (diff) | |
| parent | f529649cece9f08002c527fca25c45a5e66d2a4b (diff) | |
Merge pull request #26505 from marcelofg55/input_buffer_crashfix
Fix possible crash on AudioDriver::input_buffer_write
Diffstat (limited to 'servers/audio_server.cpp')
| -rw-r--r-- | servers/audio_server.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index df6218ac79..14c555ab5b 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -90,12 +90,16 @@ void AudioDriver::input_buffer_init(int driver_buffer_frames) { void AudioDriver::input_buffer_write(int32_t sample) { - input_buffer.write[input_position++] = sample; - if ((int)input_position >= input_buffer.size()) { - input_position = 0; - } - if ((int)input_size < input_buffer.size()) { - input_size++; + if ((int)input_position < input_buffer.size()) { + input_buffer.write[input_position++] = sample; + if ((int)input_position >= input_buffer.size()) { + input_position = 0; + } + if ((int)input_size < input_buffer.size()) { + input_size++; + } + } else { + WARN_PRINTS("input_buffer_write: Invalid input_position=" + itos(input_position) + " input_buffer.size()=" + itos(input_buffer.size())); } } @@ -145,6 +149,8 @@ AudioDriver::AudioDriver() { _last_mix_time = 0; _mix_amount = 0; + input_position = 0; + input_size = 0; #ifdef DEBUG_ENABLED prof_time = 0; |