diff options
| author | Frank Galligan <fgalligan@google.com> | 2019-05-10 18:21:43 -0700 |
|---|---|---|
| committer | Nikoli Cartagena <dargeren@google.com> | 2019-06-10 15:02:33 -0700 |
| commit | b79844f8958b169f6bfbf7c6e93b002143d4668a (patch) | |
| tree | 527dca25ecc3b0662761b1c5858880ad907558ea | |
| parent | e4375c50dfb5747550b71f503bafd50b8ca0aef1 (diff) | |
| download | libvpx-security-pi-release.tar.gz | |
Fixes a double free in ContentEncodingandroid-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-9.0.0_r61android-9.0.0_r60android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r49android-9.0.0_r48security-pi-releasepie-security-release
BUG: 127702368
Merged-In: Id7de1f8c35ef2f6458c6fb6c7751a84fe43ed1cc
Change-Id: Id17f570fe60ea2ecb3cf5cdbc179246486401005
(cherry picked from commit d2ff9ba6d9376f295b13d822d345e83841bc6189)
| -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_; |