diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:04:35 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-10 14:04:35 +0100 |
| commit | 77330d5c3125cf3d0a2118e5731de0b1bcb7f138 (patch) | |
| tree | 03ad343ad7f96e32175618dbd256d44c5842f866 /indra/llaudio | |
| parent | 83f108503aa5a34bf24ef0a167d1b76ba3800a38 (diff) | |
| parent | 8a577f1a1cf9578e5176a885b5a781bf4678e615 (diff) | |
(hairy) merge from viewer-release
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 290206ee22..fc2190707a 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -230,19 +230,29 @@ BOOL LLVorbisDecodeState::initDecode() bool abort_decode = false; - if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS ) + if (vi) + { + if( vi->channels < 1 || vi->channels > LLVORBIS_CLIP_MAX_CHANNELS ) + { + abort_decode = true; + llwarns << "Bad channel count: " << vi->channels << llendl; + } + } + else // !vi { abort_decode = true; - llwarns << "Bad channel count: " << vi->channels << llendl; + llwarns << "No default bitstream found" << llendl; } - if( (size_t)sample_count > LLVORBIS_CLIP_REJECT_SAMPLES ) + if( (size_t)sample_count > LLVORBIS_CLIP_REJECT_SAMPLES || + (size_t)sample_count <= 0) { abort_decode = true; llwarns << "Illegal sample count: " << sample_count << llendl; } - if( size_guess > LLVORBIS_CLIP_REJECT_SIZE ) + if( size_guess > LLVORBIS_CLIP_REJECT_SIZE || + size_guess < 0) { abort_decode = true; llwarns << "Illegal sample size: " << size_guess << llendl; @@ -251,7 +261,11 @@ BOOL LLVorbisDecodeState::initDecode() if( abort_decode ) { llwarns << "Canceling initDecode. Bad asset: " << mUUID << llendl; - llwarns << "Bad asset encoded by: " << ov_comment(&mVF,-1)->vendor << llendl; + vorbis_comment* comment = ov_comment(&mVF,-1); + if (comment && comment->vendor) + { + llwarns << "Bad asset encoded by: " << comment->vendor << llendl; + } delete mInFilep; mInFilep = NULL; return FALSE; |