commit 4e70ae10a362755dd46f7caec3a3846b28c6b1a8
author Neelkamal Semwal <neelkamal.semwal@ittiam.com> Thu Dec 10 14:42:55 2020 +0530
committer Ray Essick <essick@google.com> Mon Dec 14 21:43:58 2020 -0800
tree b01009739ce62a88352b85ab04d5adfbba9cc293
parent 1132e125eef69ba9632ef4002f5f24570ed0cfe1

m4v_h263: Add check on the encode dimension

Test: poc in bug description

Bug: 172716941
Bug: 172718133
Bug: 173042552

Change-Id: Id32ee0585a4188f3b303d7f2f83793d7ab8152da

media/codecs/m4v_h263/enc/src/mp4enc_api.cpp

diff --git a/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
index 7ab8f45..30e4fda 100644
--- a/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
+++ b/media/codecs/m4v_h263/enc/src/mp4enc_api.cpp
@@ -491,6 +491,9 @@
     }
     for (i = 0; i < encParams->nLayers; i++)
     {
+        if (encOption->encHeight[i] == 0 || encOption->encWidth[i] == 0 ||
+                encOption->encHeight[i] % 16 != 0 || encOption->encWidth[i] % 16 != 0)
+            goto CLEAN_UP;
         encParams->LayerHeight[i] = encOption->encHeight[i];
         encParams->LayerWidth[i] = encOption->encWidth[i];
     }