commit a65b9e02874c0e8526cef9b0f59b72eb9b2132d4
author Tom Finegan <tomfinegan@chromium.org> Fri Apr 28 22:42:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 28 22:42:04 2017 +0000
tree 8ef2ca8958aab1274d8d7faf812515850d216b44
parent 5261a679b729b064380bebeb19b28c0fd69b4b36
parent a118f3d570e15fb6f52c75339f8a676da7e58b40

Merge changes I7e467d31,Ia8633cab

* changes:
  Add test for projection parse failures.
  Add test for primary chromaticity parse failures.

testing/mkvparser_tests.cc

diff --git a/testing/mkvparser_tests.cc b/testing/mkvparser_tests.cc
index d3ce87a..9c26a1e 100644
--- a/testing/mkvparser_tests.cc
+++ b/testing/mkvparser_tests.cc
@@ -803,6 +803,18 @@
             segment_->GetFirst()->GetNext(block_entry, block_entry));
 }
 
+TEST_F(ParserTest, InvalidProjectionFloatOverflow) {
+  ASSERT_NO_FATAL_FAILURE(
+      CreateSegmentNoHeaderChecks("invalid/projection_float_overflow.webm"));
+  EXPECT_EQ(mkvparser::E_FILE_FORMAT_INVALID, segment_->Load());
+}
+
+TEST_F(ParserTest, InvalidPrimaryChromaticityParseFail) {
+  ASSERT_NO_FATAL_FAILURE(CreateSegmentNoHeaderChecks(
+      "invalid/primarychromaticity_fieldtoolarge.webm"));
+  EXPECT_EQ(mkvparser::E_FILE_FORMAT_INVALID, segment_->Load());
+}
+
 }  // namespace test
 
 int main(int argc, char* argv[]) {

testing/testdata/invalid/primarychromaticity_fieldtoolarge.webm

diff --git a/testing/testdata/invalid/primarychromaticity_fieldtoolarge.webm b/testing/testdata/invalid/primarychromaticity_fieldtoolarge.webm
new file mode 100644
index 0000000..c432425
--- /dev/null
+++ b/testing/testdata/invalid/primarychromaticity_fieldtoolarge.webm
@@ -0,0 +1 @@
+EߣŸB00B00B00B00B‚„webmB00B00S€g
0000000»‹00000000000»Œ000000000000ì¼000000000000000000000000000000000000000000000000000000000000€“0000000000000000000W0“0000000000000000000T®k@ž®@›×0s00ƒ
†…00000à@‡°‚00º0U°ýU¸0U¹0Uº0U»0U¼0U½0UÐÆUل0000Uڄ0000Uф0000UÒ000000000000000000000000000000000000000000000000000000000000000000000000000
\ No newline at end of file

testing/testdata/invalid/projection_float_overflow.webm

diff --git a/testing/testdata/invalid/projection_float_overflow.webm b/testing/testdata/invalid/projection_float_overflow.webm
new file mode 100644
index 0000000..46f6208
--- /dev/null
+++ b/testing/testdata/invalid/projection_float_overflow.webm
Binary files differ