commit 69fb36f0d15c39b616e92642522f93f678bf3315
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 02 13:48:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 02 13:48:17 2019 +0000
tree 683d8b8b75349597f209608caa492bf4245bb113
parent ddf94140d726434976d5f1b13a07964123478f2f
parent 10ceef9f3b96e5c7bc783432fe569333a2405cf0

Merge "aacenc: fix timestamp off by one frame" into qt-dev

media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp

diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
index f18f789..679b091 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
@@ -1355,6 +1355,14 @@
             int tmpHeight = (tmpDisplayHeight + 15) & -16;
             int tmpWidth = (tmpDisplayWidth + 15) & -16;
 
+            if (tmpWidth > video->width)
+            {
+                // while allowed by the spec, this decoder does not actually
+                // support an increase in size.
+                ALOGE("width increase not supported");
+                status = PV_FAIL;
+                goto return_point;
+            }
             if (tmpHeight * tmpWidth > video->size)
             {
                 // This is just possibly "b/37079296".