From caba78ef49e8cc2250ea79c2d21e5e3710354199 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 23 May 2014 01:26:01 -0700 Subject: [PATCH] Fixes a bug for uninitialized frame buffers Fixes a bug introduced in https://gerrit.chromium.org/gerrit/#/c/69779/13, where uninitialized frame buffers due to corrupt and short buffer sizes, may cause a crash. This patch fixes the currently failing video/processing/static_image/vp8_convert_test Change-Id: I1b09e21482f292c11a2bfb4e570aef1d643410a7 --- vp8/vp8_dx_iface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 10cbc6a58..d6dfb1643 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -386,8 +386,10 @@ static vpx_codec_err_t vp8_decode(vpx_codec_alg_priv_t *ctx, /* Set these even if already initialized. The caller may have changed the * decrypt config between frames. */ - ctx->yv12_frame_buffers.pbi[0]->decrypt_cb = ctx->decrypt_cb; - ctx->yv12_frame_buffers.pbi[0]->decrypt_state = ctx->decrypt_state; + if (ctx->decoder_init) { + ctx->yv12_frame_buffers.pbi[0]->decrypt_cb = ctx->decrypt_cb; + ctx->yv12_frame_buffers.pbi[0]->decrypt_state = ctx->decrypt_state; + } if (!res) { -- 2.50.1