diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 02:35:27 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 02:35:27 +0000 |
| commit | 00a9b5471ffdd02f36b6c788fab8dcd9fb13d451 (patch) | |
| tree | 8fc6c29688062ea17fa29653d60baa3c8b1e8687 | |
| parent | 4616e3446361f46d9ad9d6f330ff6839e34ae9d8 (diff) | |
| download | chromium_src-00a9b5471ffdd02f36b6c788fab8dcd9fb13d451.zip chromium_src-00a9b5471ffdd02f36b6c788fab8dcd9fb13d451.tar.gz chromium_src-00a9b5471ffdd02f36b6c788fab8dcd9fb13d451.tar.bz2 | |
Roll FFmpeg to pick up security fixes.
Pulls in the following security fixes:
59c122b matroskadec: add assert on lack of overflow in pkt_size+offset
4b7c523 matroskadec: change size check in matroska_decode_buffer() to unsigned
08169fc matroskadec: move lace_size check up so it catches all code pathes
88a740a matroskadec: change assert to av_assert0()
71529bd Fix incorrect unsigned->signed conversion.
Adds a new test for the issue.
BUG=132779
TEST=ffmpeg_regression_tests, video test matrix.
TBR=scherkus
Review URL: https://chromiumcodereview.appspot.com/10546180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142328 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_regression_tests.cc | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -51,8 +51,8 @@ vars = { # These two FFmpeg variables must be updated together. One is used for SVN # checkouts and the other for Git checkouts. - "ffmpeg_revision": "141467", - "ffmpeg_hash": "425c0ec6975cba904785e4277454c2ecdd694fbf", + "ffmpeg_revision": "142289", + "ffmpeg_hash": "23f177366e3bce3a628a7d3feedceed4e18dcc04", "sfntly_revision": "128", "skia_revision": "4257", diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 6bdde35..6390eb7 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc @@ -131,9 +131,14 @@ FFMPEG_TEST_CASE(Cr112976, "security/112976.ogg", PIPELINE_OK, PIPELINE_OK, "d23bacec582c94b8a6dc53b0971bf67e"); FFMPEG_TEST_CASE(Cr116927, "security/116927.ogv", PIPELINE_ERROR_DECODE, PIPELINE_ERROR_DECODE, kNullHash, kNullHash); +FFMPEG_TEST_CASE(Cr117912, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN, + DEMUXER_ERROR_COULD_NOT_OPEN, kNullHash, kNullHash); FFMPEG_TEST_CASE(Cr123481, "security/123481.ogv", PIPELINE_OK, PIPELINE_OK, "e6dd853fcbd746c8bb2ab2b8fc376fc7", "da909399f17e8f8ad7f1fcb3c4ccc33a"); +FFMPEG_TEST_CASE(Cr132779, "security/132779.webm", + DEMUXER_ERROR_COULD_NOT_PARSE, DEMUXER_ERROR_COULD_NOT_PARSE, + kNullHash, kNullHash); // General MKV test cases. FFMPEG_TEST_CASE(MKV_0, "security/nested_tags_lang.mka.627.628", PIPELINE_OK, @@ -234,8 +239,6 @@ FFMPEG_TEST_CASE(WEBM_4, "security/out.webm.68798.1929", kNullHash, kNullHash); FFMPEG_TEST_CASE(WEBM_5, "content/frame_size_change.webm", PIPELINE_OK, PIPELINE_OK, "d8fcf2896b7400a2261bac9e9ea930f8", kNullHash); -FFMPEG_TEST_CASE(WEBM_6, "security/117912.webm", DEMUXER_ERROR_COULD_NOT_OPEN, - DEMUXER_ERROR_COULD_NOT_OPEN, kNullHash, kNullHash); // Audio Functional Tests FFMPEG_TEST_CASE(AUDIO_GAMING_0, "content/gaming/a_220_00.mp3", PIPELINE_OK, |