diff options
| author | Frank Galligan <fgalligan@google.com> | 2019-05-29 18:33:20 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-29 18:33:20 -0700 |
| commit | 1fd0ca5c2c6ad74f3b5f91b55fa654c316f6eca4 (patch) | |
| tree | 2d09c773927d6d77764299c5246877923f97aa74 | |
| parent | 3b55f75a09b097c6877b47d6e9edba9563eff27f (diff) | |
| parent | a4c1833b8c1fc28965bd5621fb305c7ba9791faf (diff) | |
| download | libvpx-1fd0ca5c2c6ad74f3b5f91b55fa654c316f6eca4.tar.gz | |
[automerger] Check there is only one settings per ContentCompression am: 0fbbf3c3e0 am: c4c9e1a11a am: 9a10274d0a am: 2ee107d26a am: 126f2177c0 am: 0f3e13bd0c am: ffeea42c15
am: a4c1833b8c
Change-Id: I7138c95d4b5547dd76fb2f0bb02ff6d8bb3742bf
| -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; } |