diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-15 18:07:39 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-15 18:07:39 +0000 |
| commit | 2ee107d26ac32ba0d0a544de094db0ae99ca6167 (patch) | |
| tree | 5a67b89344c8138a674a9c68daa89ae7b07617f4 | |
| parent | 6cf161e9246dfe74ae341119c7537ac3def0365d (diff) | |
| parent | 9a10274d0a59ae6a8b5ce5c6afa99c3232824f5b (diff) | |
| download | libvpx-2ee107d26ac32ba0d0a544de094db0ae99ca6167.tar.gz | |
[automerger] Check there is only one settings per ContentCompression am: 0fbbf3c3e0 am: c4c9e1a11a am: 9a10274d0a
Change-Id: Ic978cb0db2cc601d5eb7c292fe65076ced0e3a92
| -rw-r--r-- | libwebm/mkvparser/mkvparser.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libwebm/mkvparser/mkvparser.cc b/libwebm/mkvparser/mkvparser.cc index 70c1f043f..87adef336 100644 --- a/libwebm/mkvparser/mkvparser.cc +++ b/libwebm/mkvparser/mkvparser.cc @@ -4328,6 +4328,12 @@ long ContentEncoding::ParseCompressionEntry(long long start, long long size, 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; } |