commit aac49304e7fdabb62bf62aeb805c7b067ed1853c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 15 06:13:48 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 15 06:13:48 2019 +0000
tree 02b3c8d6feef32b53b17e6a0642e2a12e966c541
parent 33049ddad3db682fa0d2eca189f470f73def3ff0
parent 82ea21ad8651a93eabb12f7407e9f4875084f0e8

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"

libwebm/mkvparser/mkvparser.cc

diff --git a/libwebm/mkvparser/mkvparser.cc b/libwebm/mkvparser/mkvparser.cc
index 5a7b896..7eee5e0 100644
--- a/libwebm/mkvparser/mkvparser.cc
+++ b/libwebm/mkvparser/mkvparser.cc
@@ -4230,6 +4230,7 @@
         new (std::nothrow) ContentEncryption*[encryption_count];
     if (!encryption_entries_) {
       delete[] compression_entries_;
+      compression_entries_ = NULL;
       return -1;
     }
     encryption_entries_end_ = encryption_entries_;
@@ -4325,6 +4326,12 @@
         return status;
       }
 
+      // There should be only one settings element per content compression.
+      if (compression->settings != NULL) {
+        delete[] buf;
+        return E_FILE_FORMAT_INVALID;
+      }
+
       compression->settings = buf;
       compression->settings_len = buflen;
     }