commit 83f2a112acc7ea58e29344c479fc740ac5259358
author John Koleszar <jkoleszar@google.com> Mon Mar 11 12:30:29 2013 -0700
committer John Koleszar <jkoleszar@google.com> Mon Mar 11 12:30:29 2013 -0700
tree 03b0b1ffb159bc86f29204bb65b0e61ef9828a8e
parent 1e8b3da75ea1aad821c86dd15d311108354d1019

vpxdec: fix use of uninitialized do_scale argument

This fixes a potential crash with VP8 streams that have an alt-ref on
the first frame, as well as potentially scaling the output in cases
where that wasn't desired.

Change-Id: I1fd74b5ab43329fbbffecb004dfd44de34c4dc22

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index 30196ec..41c654f 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -711,7 +711,7 @@
   struct input_ctx        input = {0};
   int                     frames_corrupted = 0;
   int                     dec_flags = 0;
-  int                     do_scale;
+  int                     do_scale = 0;
   int                     stream_w = 0, stream_h = 0;
   vpx_image_t             *scaled_img = NULL;
 
@@ -1024,7 +1024,7 @@
 
     if (!noblit) {
       if (do_scale) {
-        if (frame_out == 1) {
+        if (img && frame_out == 1) {
           stream_w = img->d_w;
           stream_h = img->d_h;
           scaled_img = vpx_img_alloc(NULL, VPX_IMG_FMT_I420,