diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
| commit | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (patch) | |
| tree | 58e7cd0674a1286544f883257cc2f43969ea201f /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge
Diffstat (limited to 'indra/llaudio/llaudiodecodemgr.cpp')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 77e57b14f5..6ab61689fd 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -265,9 +265,19 @@ BOOL LLVorbisDecodeState::initDecode() mInFilep = NULL; return FALSE; } - - mWAVBuffer.reserve(size_guess); - mWAVBuffer.resize(WAV_HEADER_SIZE); + + try + { + mWAVBuffer.reserve(size_guess); + mWAVBuffer.resize(WAV_HEADER_SIZE); + } + catch (std::bad_alloc) + { + LL_WARNS("AudioEngine") << "Out of memory when trying to alloc buffer: " << size_guess << LL_ENDL; + delete mInFilep; + mInFilep = NULL; + return FALSE; + } { // write the .wav format header |