commit 2a4434571f92f5443309f9b9b42d7c0a40c4c864
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 17 20:37:56 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 17 20:37:56 2020 +0000
tree 2b071cad11d8feafd0ae0cfef9694265145e6689
parent f224b6d5c39e435038789e12162fb90459ca36ab
parent 4e70ae10a362755dd46f7caec3a3846b28c6b1a8

Merge "m4v_h263: Add check on the encode dimension"

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];
     }