diff options
Diffstat (limited to 'chromium/media/ffmpeg/ffmpeg_regression_tests.cc')
| -rw-r--r-- | chromium/media/ffmpeg/ffmpeg_regression_tests.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chromium/media/ffmpeg/ffmpeg_regression_tests.cc b/chromium/media/ffmpeg/ffmpeg_regression_tests.cc index 19f00f81aef..0b68fd0896c 100644 --- a/chromium/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/chromium/media/ffmpeg/ffmpeg_regression_tests.cc @@ -152,6 +152,11 @@ FFMPEG_TEST_CASE(Cr234630b, "security/234630b.mov", PIPELINE_ERROR_DECODE, FFMPEG_TEST_CASE(Cr242786, "security/242786.webm", PIPELINE_OK, PIPELINE_OK, kNullVideoHash, "-1.72,-0.83,0.84,1.70,1.23,-0.53,"); +// Test for out-of-bounds access with slightly corrupt file (detection logic +// thinks it's a MONO file, but actually contains STEREO audio). +FFMPEG_TEST_CASE(Cr275590, "security/275590.m4a", + DECODER_ERROR_NOT_SUPPORTED, DEMUXER_ERROR_COULD_NOT_OPEN, + kNullVideoHash, kNullAudioHash); // General MP4 test cases. FFMPEG_TEST_CASE(MP4_0, "security/aac.10419.mp4", DEMUXER_ERROR_COULD_NOT_OPEN, @@ -359,7 +364,7 @@ FLAKY_FFMPEG_TEST_CASE(WEBM_2, "security/uninitialize.webm"); TEST_P(FFmpegRegressionTest, BasicPlayback) { if (GetParam().init_status == PIPELINE_OK) { ASSERT_TRUE(Start(GetTestDataFilePath(GetParam().filename), - GetParam().init_status, true)); + GetParam().init_status, kHashed)); Play(); ASSERT_EQ(WaitUntilEndedOrError(), GetParam().end_status); EXPECT_EQ(GetParam().video_md5, GetVideoHash()); @@ -374,7 +379,7 @@ TEST_P(FFmpegRegressionTest, BasicPlayback) { } } else { ASSERT_FALSE(Start(GetTestDataFilePath(GetParam().filename), - GetParam().init_status, true)); + GetParam().init_status, kHashed)); EXPECT_EQ(GetParam().video_md5, GetVideoHash()); EXPECT_EQ(GetParam().audio_md5, GetAudioHash()); } |