Changeset 181174 in webkit

Timestamp:

Mar 6, 2015 11:31:16 AM (9 years ago)

Author:

jer.noble@apple.com

Message:

[Web Audio] Decoding specific .m4a file crashes tab
​https://bugs.webkit.org/show_bug.cgi?id=139545

Reviewed by Eric Carlson.

Source/WebCore:

Test: webaudio/decode-audio-data-too-short.html

Bail out early if CoreAudio reports the number of frames in the file to be negative.

• platform/audio/mac/AudioFileReaderMac.cpp:

(WebCore::AudioFileReader::createBus):

LayoutTests:

• webaudio/decode-audio-data-too-short-expected.txt: Added.
• webaudio/decode-audio-data-too-short.html: Added.
• webaudio/resources/media/too-short.m4a: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/decode-audio-data-too-short-expected.txt (added)
• LayoutTests/webaudio/decode-audio-data-too-short.html (added)
• LayoutTests/webaudio/resources/media/too-short.m4a (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-06  Jer Noble  <jer.noble@apple.com>
+
+        [Web Audio] Decoding specific .m4a file crashes tab
+        https://bugs.webkit.org/show_bug.cgi?id=139545
+
+        Reviewed by Eric Carlson.
+
+        * webaudio/decode-audio-data-too-short-expected.txt: Added.
+        * webaudio/decode-audio-data-too-short.html: Added.
+        * webaudio/resources/media/too-short.m4a: Added.
+
 2015-03-06  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-06  Jer Noble  <jer.noble@apple.com>
+
+        [Web Audio] Decoding specific .m4a file crashes tab
+        https://bugs.webkit.org/show_bug.cgi?id=139545
+
+        Reviewed by Eric Carlson.
+
+        Test: webaudio/decode-audio-data-too-short.html
+
+        Bail out early if CoreAudio reports the number of frames in the file to be negative.
+
+        * platform/audio/mac/AudioFileReaderMac.cpp:
+        (WebCore::AudioFileReader::createBus):
+
 2015-03-06  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/platform/audio/mac/AudioFileReaderMac.cpp

@@ -148 +148 @@
     size = sizeof(numberOfFrames64);
     result = ExtAudioFileGetProperty(m_extAudioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &numberOfFrames64);
-    if (result != noErr)
+    if (result != noErr || numberOfFrames64 <= 0)
         return 0;