mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-28 22:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4842 - Redundant condition in MS_ADPCM_Decode and IMA_ADPCM_Decode

Browse Source 
(Thanks!)
This commit is contained in:
Sylvain Becker
2019-10-23 09:36:41 +02:00
parent c9d0e2ae0a
commit ed469fa586
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/SDL_wave.c
View File

@@ -717,7 +717,7 @@ MS_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
result = MS_ADPCM_DecodeBlockData(&state); result = MS_ADPCM_DecodeBlockData(&state);
if (result == -1) { if (result == -1) {
/* Unexpected end. Stop decoding and return partial data if necessary. */ /* Unexpected end. Stop decoding and return partial data if necessary. */
if (file->trunchint == TruncVeryStrict || file->trunchint == TruncVeryStrict) { if (file->trunchint == TruncVeryStrict || file->trunchint == TruncStrict) {
SDL_free(state.output.data); SDL_free(state.output.data);
return SDL_SetError("Truncated data chunk"); return SDL_SetError("Truncated data chunk");
} else if (file->trunchint != TruncDropFrame) { } else if (file->trunchint != TruncDropFrame) {
@@ -1114,7 +1114,7 @@ IMA_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
if (result == -1) { if (result == -1) {
/* Unexpected end. Stop decoding and return partial data if necessary. */ /* Unexpected end. Stop decoding and return partial data if necessary. */
if (file->trunchint == TruncVeryStrict || file->trunchint == TruncVeryStrict) { if (file->trunchint == TruncVeryStrict || file->trunchint == TruncStrict) {
SDL_free(state.output.data); SDL_free(state.output.data);
SDL_free(cstate); SDL_free(cstate);
return SDL_SetError("Truncated data chunk"); return SDL_SetError("Truncated data chunk");