Khaganat-NeL/khanat-opennel-code
1
0
Fork 0
Code Issues 21 Pull requests Packages Projects Releases 1 Wiki Activity

Fixed: Possible crashes if ov_info returns NULL

Browse source
This commit is contained in:
kervala 2016-03-18 15:09:02 +01:00
parent d72a59f5ea
commit b4de9e66f5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/sound/audio_decoder_vorbis.cpp
View file

@ -195,13 +195,17 @@ uint32 CAudioDecoderVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 m
uint8 CAudioDecoderVorbis::getChannels() uint8 CAudioDecoderVorbis::getChannels()
{ {
vorbis_info *vi = ov_info(&_OggVorbisFile, -1); vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
return (uint8)vi->channels; if (vi) return (uint8)vi->channels;
nlwarning("ov_info returned NULL");
return 0;
} }
uint CAudioDecoderVorbis::getSamplesPerSec() uint CAudioDecoderVorbis::getSamplesPerSec()
{ {
vorbis_info *vi = ov_info(&_OggVorbisFile, -1); vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
return (uint)vi->rate; if (vi) return (uint)vi->rate;
nlwarning("ov_info returned NULL");
return 0;
} }
uint8 CAudioDecoderVorbis::getBitsPerSample() uint8 CAudioDecoderVorbis::getBitsPerSample()