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

Commit 47c064df authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "m4v_h263: Fix integer-overflow in decoder IDCT functions" am:... 

Merge "m4v_h263: Fix integer-overflow in decoder IDCT functions" am: 7a0123c6 am: 54a220bf am: f34e99d5

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

Change-Id: I523f7da5445b35025ea24e82f756d9b61d792aab
parents 9cb4734a f34e99d5

media/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp

+2 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ void BlockIDCT( 
/*----------------------------------------------------------------------------

; Function Code FOR idctrow

----------------------------------------------------------------------------*/

__attribute__((no_sanitize("signed-integer-overflow")))

void idctrow(

    int16 *blk, uint8 *pred, uint8 *dst, int width

)
@@ -828,6 +829,7 @@ void idctrow_intra( 
/*----------------------------------------------------------------------------

; Function Code FOR idctcol

----------------------------------------------------------------------------*/

__attribute__((no_sanitize("signed-integer-overflow")))

void idctcol(

    int16 *blk

)

media/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp

+7 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ void idctcol1(int16 *blk) 
    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 @@ void idctcol2(int16 *blk) 
    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 @@ void idctcol3(int16 *blk) 
}





__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 @@ void idctrow4(int16 *blk, uint8 *pred, uint8 *dst, int width) 
    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 @@ void idctrow1_intra(int16 *blk, PIXEL *comp, int width) 
    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 @@ void idctrow2_intra(int16 *blk, PIXEL *comp, int width) 
    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 @@ void idctrow3_intra(int16 *blk, PIXEL *comp, int width) 
    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;