diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-02 19:02:49 -0700 |
| commit | 6a9e70053beaa0fb936482f5594137a8bcdf2f1e (patch) | |
| tree | 9f6a44825ed0886807c4b38d9a92188261bbaf25 /indra/llaudio/llvorbisencode.cpp | |
| parent | 4902a2752e6ee5dfd47be3d94955f88bf73bf5d8 (diff) | |
| parent | accbddaeadeec7221c9244bf1c0245b8ccbd12bc (diff) | |
Merge
Diffstat (limited to 'indra/llaudio/llvorbisencode.cpp')
| -rw-r--r-- | indra/llaudio/llvorbisencode.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 9f479189d7..0e0c80a456 100644 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -120,6 +120,13 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro + ((U32) wav_header[5] << 8) + wav_header[4]; + if (chunk_length > physical_file_size - file_pos - 4) + { + infile.close(); + error_msg = "SoundFileInvalidChunkSize"; + return(LLVORBISENC_CHUNK_SIZE_ERR); + } + // llinfos << "chunk found: '" << wav_header[0] << wav_header[1] << wav_header[2] << wav_header[3] << "'" << llendl; if (!(strncmp((char *)&(wav_header[0]),"fmt ",4))) |