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

diff --git a/vpxdec.c b/vpxdec.c
index 30196ecc870aca698cb29790d271a2d3a90122a2..41c654faea5230f3969a4cf0da2a5af703da8b72 100644 (file)
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -711,7 +711,7 @@ int main(int argc, const char **argv_) {
   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 @@ int main(int argc, const char **argv_) {
 
     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,