commit b6b349550ffb505fd466f0f5aea635a52a569e13
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 09 02:49:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 02:49:11 2018 +0000
tree 3a4c1dd22f44f9f626eedf0f4315db30eba5691f
parent 6378937c0d8215f2248217aa8f26d84f72a638ee
parent 2dc734060c4f27227cf129b1a41c68200d0ce67a

Merge "C2SoftAvcEnc: don't crash at unexpected input" into pi-dev

media/libstagefright/codecs/avcenc/C2SoftAvcEnc.cpp

diff --git a/media/libstagefright/codecs/avcenc/C2SoftAvcEnc.cpp b/media/libstagefright/codecs/avcenc/C2SoftAvcEnc.cpp
index 8fb8122..d75e4c1 100644
--- a/media/libstagefright/codecs/avcenc/C2SoftAvcEnc.cpp
+++ b/media/libstagefright/codecs/avcenc/C2SoftAvcEnc.cpp
@@ -909,6 +909,9 @@
     }
 
     ALOGV("width = %d, height = %d", input->width(), input->height());
+    if (mWidth != input->width() || mHeight != input->height()) {
+        return C2_BAD_VALUE;
+    }
     const C2PlanarLayout &layout = input->layout();
     uint8_t *yPlane = const_cast<uint8_t *>(input->data()[C2PlanarLayout::PLANE_Y]);
     uint8_t *uPlane = const_cast<uint8_t *>(input->data()[C2PlanarLayout::PLANE_U]);