commit fd9b809147b78330d1db7ec17e200071e779fd46
author Taehwan Kim <t_h.kim@samsung.com> Thu Sep 17 12:26:40 2020 +0900
committer Wonsik Kim <wonsik@google.com> Thu Sep 17 17:30:25 2020 +0000
tree 29edb57694eb19f9cd37c925cdaf63a7b7af0edc
parent d5a46a87e8a35495843ec141ecf3b62d963bdcb2

CCodec: fix underflow issue on handleImageData

the logic is assumed that gralloc does assume a contiguous mapping
at GraphicView2MediaImageConverter() in Codec2Buffer.
if it doesn't, underflow could happen because
type of variable is unsigned.

Bug: 168757280

Change-Id: I04e13d0680af74e76d96d3ab10a549f6368205cf
Signed-off-by: Taehwan Kim <t_h.kim@samsung.com>

media/codec2/sfplugin/CCodecBuffers.cpp

diff --git a/media/codec2/sfplugin/CCodecBuffers.cpp b/media/codec2/sfplugin/CCodecBuffers.cpp
index e58a1e4..10f7e66 100644
--- a/media/codec2/sfplugin/CCodecBuffers.cpp
+++ b/media/codec2/sfplugin/CCodecBuffers.cpp
@@ -91,7 +91,9 @@
             newFormat->setInt32(KEY_STRIDE, stride);
             ALOGD("[%s] updating stride = %d", mName, stride);
             if (img->mNumPlanes > 1 && stride > 0) {
-                int32_t vstride = (img->mPlane[1].mOffset - img->mPlane[0].mOffset) / stride;
+                int64_t offsetDelta =
+                    (int64_t)img->mPlane[1].mOffset - (int64_t)img->mPlane[0].mOffset;
+                int32_t vstride = int32_t(offsetDelta / stride);
                 newFormat->setInt32(KEY_SLICE_HEIGHT, vstride);
                 ALOGD("[%s] updating vstride = %d", mName, vstride);
             }