commit 7d78f8a2f85847a182640ab89ffd7b5a086daff1
author Vignesh Venkatasubramanian <vigneshv@google.com> Fri Aug 19 09:09:11 2016 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 26 23:48:17 2017 +0000
tree a0185d3681b769e6d18259ee5556f5d47a47660c
parent 05184fca97b7f38015fcef0c52998905c9a6bdf0

DO NOT MERGE libvpx: Cherry-pick 8b4c315 from upstream

Description from upstream:
vp9_alloc_context_buffers: clear cm->mi* on failure

this fixes a crash in vp9_dec_setup_mi() via
vp9_init_context_buffers() should decoding continue and the decoder
resyncs on a smaller frame

Bug: 30593752
Bug: 36492119
Change-Id: Iafbf1c4114062bf796f51a6b03be71328f7bcc69
(cherry picked from commit 737c8493693243838128788fe9c3abc51f17338e)
(cherry picked from commit 3efaea152814af81f6f7a96d8bb449719ec55e3f)

libvpx/vp9/common/vp9_alloccommon.c

diff --git a/libvpx/vp9/common/vp9_alloccommon.c b/libvpx/vp9/common/vp9_alloccommon.c
index 24c6c54..aaf9a75 100644
--- a/libvpx/vp9/common/vp9_alloccommon.c
+++ b/libvpx/vp9/common/vp9_alloccommon.c
@@ -164,6 +164,7 @@
   return 0;
 
  fail:
+  vp9_set_mb_mi(cm, 0, 0);
   vp9_free_context_buffers(cm);
   return 1;
 }