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

Commit 22a611ff authored by Ray Essick's avatar Ray Essick Committed by android-build-merger
Browse files

Merge "Fix detected integer sanitization" into pi-dev am: 3e499175 

am: 64f2efcf

Change-Id: If2b68fc4862331f5c17a6db319cae153af03284c
parents 333c6b74 64f2efcf

media/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp

+5 −1
Original line number Diff line number Diff line
@@ -299,7 +299,11 @@ ERROR_CODE pvmp3_framedecoder(tPVMP3DecoderExternal *pExt, 
        }





        bytes_to_discard = pVars->frame_start - pVars->sideInfo.main_data_begin - main_data_end;

        // force signed computation; buffer sizes and offsets are all going to be

        // well within the constraints of 32-bit signed math.

        bytes_to_discard = pVars->frame_start

                           - ((int32)pVars->sideInfo.main_data_begin)

                           - ((int32)main_data_end);





        if (main_data_end > BUFSIZE)   /* check overflow on the buffer */

media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ ERROR_CODE pvmp3_get_side_info(tmp3Bits *inputStream, 
                tmp = getbits_crc(inputStream, 22, crc, info->error_protection);



                si->ch[ch].gran[gr].big_values            = (tmp << 10) >> 23;   /* 9 */

                si->ch[ch].gran[gr].global_gain           = ((tmp << 19) >> 24) - 210;   /* 8 */

                si->ch[ch].gran[gr].global_gain        = (int32)((tmp << 19) >> 24) - 210; /* 8 */

                si->ch[ch].gran[gr].scalefac_compress     = (tmp << 27) >> 28;   /* 4 */

                si->ch[ch].gran[gr].window_switching_flag = tmp & 1;         /* 1 */

media/libstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.cpp

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,10 @@ const int32 is_ratio_factor[8] = {0, 
; FUNCTION CODE

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



#if __has_attribute(no_sanitize)

// deliberately playing near overflow points of int32

__attribute__((no_sanitize("integer")))

#endif

void pvmp3_st_mid_side(int32 xr[SUBBANDS_NUMBER*FILTERBANK_BANDS],

                       int32 xl[SUBBANDS_NUMBER*FILTERBANK_BANDS],

                       int32 Start,