Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added zmagic to decoding of ogg files instead of snowglobes audio crash fix, allows old sounds longer then 30 secs to play.

Browse Source
This commit is contained in:
phr0z3nt04st
2010-05-16 22:05:10 -05:00
parent 01dd55579a
commit 949e269402
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/llaudio/llaudiodecodemgr.cpp
View File

@@ -226,24 +226,21 @@ BOOL LLVorbisDecodeState::initDecode()
size_guess += 2048; size_guess += 2048;
bool abort_decode = false; bool abort_decode = false;
if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS ) // This magic value is equivilent to 150MiB of data.
// Prevents griffers from utilizin a huge xbox sound the size of god to instafry the viewer
if(size_guess >= 157286400)
{
llwarns << "Bad sound caught by zmagic" << llendl;
abort_decode = true;
}
else if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS )
{ {
abort_decode = true; abort_decode = true;
llwarns << "Bad channel count: " << vi->channels << llendl; llwarns << "Bad channel count: " << vi->channels << llendl;
} }
if( (size_t)sample_count > LLVORBIS_CLIP_REJECT_SAMPLES )
{
abort_decode = true;
llwarns << "Illegal sample count: " << sample_count << llendl;
}
if( size_guess > LLVORBIS_CLIP_REJECT_SIZE )
{
abort_decode = true;
llwarns << "Illegal sample size: " << size_guess << llendl;
}
if( abort_decode ) if( abort_decode )
{ {