diff options
| author | Frank Galligan <fgalligan@google.com> | 2019-05-29 18:33:27 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-29 18:33:27 -0700 |
| commit | 95a2529f2a786cda8025f045bbc39a0ef1602a69 (patch) | |
| tree | 527dca25ecc3b0662761b1c5858880ad907558ea | |
| parent | 1fd0ca5c2c6ad74f3b5f91b55fa654c316f6eca4 (diff) | |
| parent | 6e420b88c62b0d98cd3053743fcd3fe43f866d48 (diff) | |
| download | libvpx-95a2529f2a786cda8025f045bbc39a0ef1602a69.tar.gz | |
[automerger] Fixes a double free in ContentEncoding am: d2ff9ba6d9 am: 126c36767c am: 14de93dcba am: 262d9ebb99 am: 675d296525 am: 6cdf87a296 am: 8c18b78a7e
am: 6e420b88c6
Change-Id: Idf2f43e5c3441b21ff89122e095533584841f108
| -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_; |