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