Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4601bb7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "m4v_h263: Fix integer-overflow in idct_vca.cpp" am: 46c5b630 am:...

Merge "m4v_h263: Fix integer-overflow in idct_vca.cpp" am: 46c5b630 am: f903a227 am: 6e6d15a1 am: 9128c69e

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1465989

Change-Id: If7a537a14c6c9879bc2bda297de464c8f629ab99
parents ce32ef78 9128c69e
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ void idctcol0(int16 *)
    return ;
    return ;
}
}


__attribute__((no_sanitize("signed-integer-overflow")))
void idctrow1(int16 *blk, uint8 *pred, uint8 *dst, int width)
void idctrow1(int16 *blk, uint8 *pred, uint8 *dst, int width)
{
{
    /* shortcut */
    /* shortcut */
@@ -156,6 +157,7 @@ void idctrow2(int16 *blk, uint8 *pred, uint8 *dst, int width)
    return ;
    return ;
}
}


__attribute__((no_sanitize("signed-integer-overflow")))
void idctcol2(int16 *blk)
void idctcol2(int16 *blk)
{
{
    int32 x0, x1, x3, x5, x7;//, x8;
    int32 x0, x1, x3, x5, x7;//, x8;
@@ -256,6 +258,7 @@ void idctrow3(int16 *blk, uint8 *pred, uint8 *dst, int width)
    return ;
    return ;
}
}


__attribute__((no_sanitize("signed-integer-overflow")))
void idctcol3(int16 *blk)
void idctcol3(int16 *blk)
{
{
    int32 x0, x1, x2, x3, x4, x5, x6, x7, x8;
    int32 x0, x1, x2, x3, x4, x5, x6, x7, x8;