diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-29 22:05:54 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-05-29 22:05:54 +0000 |
| commit | 262d9ebb99fc229cf08f661815af8063f56ed7b4 (patch) | |
| tree | caff4be50e9105e2b0184c9af19107b105e1e590 | |
| parent | 2ee107d26ac32ba0d0a544de094db0ae99ca6167 (diff) | |
| parent | 14de93dcba30cd33489405e9bfef382d721b9c93 (diff) | |
| download | libvpx-262d9ebb99fc229cf08f661815af8063f56ed7b4.tar.gz | |
[automerger] Fixes a double free in ContentEncoding am: d2ff9ba6d9 am: 126c36767c am: 14de93dcba
Change-Id: I50f4cbe4b7228b1eb035afe39b8156ef8cadcae0
| -rw-r--r-- | libwebm/mkvparser/mkvparser.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libwebm/mkvparser/mkvparser.cc b/libwebm/mkvparser/mkvparser.cc index 87adef336..efd35452a 100644 --- a/libwebm/mkvparser/mkvparser.cc +++ b/libwebm/mkvparser/mkvparser.cc @@ -4233,6 +4233,7 @@ long ContentEncoding::ParseContentEncodingEntry(long long start, long long size, new (std::nothrow) ContentEncryption*[encryption_count]; if (!encryption_entries_) { delete[] compression_entries_; + compression_entries_ = NULL; return -1; } encryption_entries_end_ = encryption_entries_; |