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

Commit 4e208206 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Gerrit Code Review
Browse files

Merge changes I6459b789,Ia19d2914

* changes:
  fix: warning introduced by previous patch
  [PATCH] fix: the sanitizer sees evil everywhere
parents cea78139 507df23f
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -27,14 +27,14 @@ bool lc3_attdet_run(enum lc3_dt dt, enum lc3_srate sr,
{
    /* --- Check enabling --- */

    const unsigned *nbytes_range =
        (const unsigned [LC3_NUM_DT][LC3_NUM_SRATE-LC3_SRATE_32K][2]){
    const unsigned nbytes_ranges[LC3_NUM_DT][LC3_NUM_SRATE - LC3_SRATE_32K][2] = {
            [LC3_DT_7M5] = { { 61,     149 }, {  75,     149 } },
            [LC3_DT_10M] = { { 81, UINT_MAX }, { 100, UINT_MAX } },
        }[dt][sr - LC3_SRATE_32K];
            [LC3_DT_10M] = { { 81, INT_MAX }, { 100, INT_MAX } },
    };

    if (sr < LC3_SRATE_32K || nbytes < nbytes_range[0]
                           || nbytes > nbytes_range[1])
    if (sr < LC3_SRATE_32K ||
            nbytes < nbytes_ranges[dt][sr - LC3_SRATE_32K][0] ||
            nbytes > nbytes_ranges[dt][sr - LC3_SRATE_32K][1]   )
        return 0;

    /* --- Filtering & Energy calculation --- */