diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-15 18:07:34 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-15 18:07:34 +0000 |
| commit | c4c9e1a11a82a966c4dcae8e22eff745b37adc6d (patch) | |
| tree | 5a67b89344c8138a674a9c68daa89ae7b07617f4 | |
| parent | 6b040ab5b6b08f1995fcc9c4a1f3dc4ab99590d7 (diff) | |
| parent | 0fbbf3c3e05647aa10174a1876e02ba6a2ec631d (diff) | |
| download | libvpx-c4c9e1a11a82a966c4dcae8e22eff745b37adc6d.tar.gz | |
[automerger] Check there is only one settings per ContentCompression am: 0fbbf3c3e0
Change-Id: If3f2e76eafefb45f6d521b3689c5b1d64513f564
| -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; } |