Merge "m4v_h263: Fix integer-overflow in decoder IDCT functions" am: 7a0123c6e6 am: 54a220bfb8 am: f34e99d5c0 am: 47c064df2d am: f4603403a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1398269
Change-Id: Ibd9e72aeb13f96081c8638ef4c6aad3b306a0727
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
index 3d10086..bc708e2 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
@@ -506,6 +506,7 @@
/*----------------------------------------------------------------------------
; Function Code FOR idctrow
----------------------------------------------------------------------------*/
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow(
int16 *blk, uint8 *pred, uint8 *dst, int width
)
@@ -828,6 +829,7 @@
/*----------------------------------------------------------------------------
; Function Code FOR idctcol
----------------------------------------------------------------------------*/
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctcol(
int16 *blk
)
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
index f35ce4f..0ba4944 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
@@ -94,6 +94,7 @@
return;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow2(int16 *blk, uint8 *pred, uint8 *dst, int width)
{
int32 x0, x1, x2, x4, x5;
@@ -182,6 +183,7 @@
return ;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow3(int16 *blk, uint8 *pred, uint8 *dst, int width)
{
int32 x0, x1, x2, x3, x4, x5, x6, x7, x8;
@@ -291,6 +293,7 @@
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow4(int16 *blk, uint8 *pred, uint8 *dst, int width)
{
int32 x0, x1, x2, x3, x4, x5, x6, x7, x8;
@@ -368,6 +371,7 @@
return ;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctcol4(int16 *blk)
{
int32 x0, x1, x2, x3, x4, x5, x6, x7, x8;
@@ -445,6 +449,7 @@
return;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow2_intra(int16 *blk, PIXEL *comp, int width)
{
int32 x0, x1, x2, x4, x5, temp;
@@ -502,6 +507,7 @@
return ;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow3_intra(int16 *blk, PIXEL *comp, int width)
{
int32 x0, x1, x2, x3, x4, x5, x6, x7, x8, temp;
@@ -575,6 +581,7 @@
return ;
}
+__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow4_intra(int16 *blk, PIXEL *comp, int width)
{
int32 x0, x1, x2, x3, x4, x5, x6, x7, x8, temp;