diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 22:37:40 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 22:37:40 +0000 |
| commit | 048cc8ece648d667c09aeb1eea0d979b790d569a (patch) | |
| tree | 50852b4c04226bc05790612fc58de25f1e89779f /media/ffmpeg | |
| parent | 37d9dccef3f855d2bbe843a5d519c11ed33c41d5 (diff) | |
| download | chromium_src-048cc8ece648d667c09aeb1eea0d979b790d569a.zip chromium_src-048cc8ece648d667c09aeb1eea0d979b790d569a.tar.gz chromium_src-048cc8ece648d667c09aeb1eea0d979b790d569a.tar.bz2 | |
Roll DEPS for FFmpeg security fix.
Pulls in:
bdeb61c h264: check that luma and chroma depth match
21f6852 aacdec: dont pop random configurations
8a64491 avcodec_decode_audio4: check got_frame_ptr before handling initial skip
da7672b h264: Fix handling of changing reference counts between slices
cdf0877 h264/cabac: check loop index
96f452a aacdec: check channel count
d270c32 avcodec_decode_audio: do not trust the channel layout, use the channel count.
e1d7d4b mpegvideo: reset context state on failed thread update.
8ac8f04 mpegvideo: Fix long standing race condition with frame threads
a6e4796 pthread: Do not use a half updated context as master for deallocation.
d9226b3 mpegvideo: dont leave stale pointers in next/last picture
b53adef h264: reset first_field when current_picture_ptr is reset
23318a5 error_concealment: Check that the picture is not in a half setup state.
1a088f6 oggparseskeleton: Check the overall start time before using it.
953061e lavf/utils: more complete dts checks
1d29624 oggparsevorbis: check channels
7973a07 h264: Improve first slice and slice type checks
d7599bd h264: dont mess with frame gaps on second fields.
51fcf27 mp3on4: fix null pointer dereference
028cc42 read_gab2_sub: fix null pointer dereference
a0f659b oggspeexparse: fix array overread
e8ca7cf h264: avoid calling idr() twice
9db3fb6 oggdec: prevent codec from changing through ogg_replace_stream()
599ae99 ff_emulated_edge_mc: fix handling of w/h being 0
5e1bacf matroskadec: reset size when freeing data.
Since we're in the middle of an upstream merge, we can't update the
git repository at this time. So this only updates the SVN repository
used for official builds.
BUG=222754
TEST=asan passes.
TBR=scherkus
Review URL: https://codereview.chromium.org/12941010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_regression_tests.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index 923a610..aa7fb86 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc @@ -151,6 +151,8 @@ FFMPEG_TEST_CASE(Cr152691, "security/152691.mp3", PIPELINE_ERROR_DECODE, "59adb24ef3cdbe0297f05b395827453f"); FFMPEG_TEST_CASE(Cr161639, "security/161639.m4a", PIPELINE_OK, PIPELINE_OK, kNullHash, "97ae2fa2a2e9ff3c2cf17be96b08bbe8"); +FFMPEG_TEST_CASE(Cr222754, "security/222754.mp4", PIPELINE_ERROR_DECODE, + PIPELINE_ERROR_DECODE, kNullHash, kNullHash); // General MKV test cases. FFMPEG_TEST_CASE(MKV_0, "security/nested_tags_lang.mka.627.628", PIPELINE_OK, |