Merge changes I7e467d31,Ia8633cab

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

testing/mkvparser_tests.cc

@@ -803,6 +803,18 @@ TEST_F(ParserTest, InvalidBlockGroupBlockEndsBlockGroup) {
             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[]) {