From 7b35b44b52d1f00baf6b5a2fa51c97f579aff0e4 Mon Sep 17 00:00:00 2001
From: Emil Lundmark <lndmrk@webrtc.org>
Date: Tue, 21 Sep 2021 09:54:44 +0200
Subject: [PATCH] Zero initialize heap allocations in
 LibvpxVp9{Decoder,Encoder}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: chromium:1251010
Change-Id: Iffefdc8bee3752f89b0201f56fd06a2253b53200
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232602
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35049}
---
 modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc | 1 +
 modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
index 9f363ffdc1..40b4d8233c 100644
--- a/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
+++ b/modules/video_coding/codecs/vp9/libvpx_vp9_decoder.cc
@@ -127,6 +127,7 @@ bool LibvpxVp9Decoder::Configure(const Settings& settings) {
 
   if (decoder_ == nullptr) {
     decoder_ = new vpx_codec_ctx_t;
+    memset(decoder_, 0, sizeof(*decoder_));
   }
   vpx_codec_dec_cfg_t cfg;
   memset(&cfg, 0, sizeof(cfg));
diff --git a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
index cfb69fdb76..ebe4c1e33d 100644
--- a/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
+++ b/modules/video_coding/codecs/vp9/libvpx_vp9_encoder.cc
@@ -530,9 +530,11 @@ int LibvpxVp9Encoder::InitEncode(const VideoCodec* inst,
   }
   if (encoder_ == nullptr) {
     encoder_ = new vpx_codec_ctx_t;
+    memset(encoder_, 0, sizeof(*encoder_));
   }
   if (config_ == nullptr) {
     config_ = new vpx_codec_enc_cfg_t;
+    memset(config_, 0, sizeof(*config_));
   }
   timestamp_ = 0;
   if (&codec_ != inst) {