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