summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew Productengine <adyukov@productengine.com>2010-10-25 18:56:04 +0300
committerAndrew Productengine <adyukov@productengine.com>2010-10-25 18:56:04 +0300
commit158bfc563b018ba4e0068ff4202f6d2ad1001aa1 (patch)
tree654e127b4e2e9f9e457e7f7667ae1121f6f89283 /indra/newview
parentde6f7e19c44d267d3224c56941c2ab27677c406f (diff)
STORM-95 FIXED Fixed hanging of client when incorrect WAV file was passed.
As Aimee has found: "The data chunk of nexfire.wav has an incorrect length specified in its header which we blindly trust when reading the file in check_for_invalid_wav_formats() in llvorbisencode.cpp. It causes an overflow of the file position pointer when reading the file which makes it start over from the beginning, hanging it in an infinite loop." - To avoid this situation in future, check for chunk size was added, and if it is declared bigger then it may be, function is interrupted and returns error.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 83cbcb3344..4ee04b44b6 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1367,6 +1367,14 @@ Could not find &apos;data&apos; chunk in WAV header:
<notification
icon="alertmodal.tga"
+ name="SoundFileInvalidChunkSize"
+ type="alertmodal">
+Wrong chunk size in WAV file:
+[FILE]
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="SoundFileInvalidTooLong"
type="alertmodal">
Audio file is too long (10 second maximum):