diff options
| author | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-11-09 10:05:17 +0000 |
| commit | caa53cc8cdd69bd48bd6c07fa6c98234e81f8a42 (patch) | |
| tree | 682c2571bad71cf52e5157f4703163ca2ce21f57 /indra/llaudio/llvorbisencode.cpp | |
| parent | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (diff) | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
merge up from v-d
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))) |