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

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

Merge "Avoid add overflow in summation in AMR-WB decoder" am: a3354a21

am: f25d3c40

Change-Id: Ia065090e8091fe9a9542173f5ff6da0bf35b47ec
parents 8d86a6d3 f25d3c40
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -467,7 +467,12 @@ extern "C"
    __inline  int32 fxp_mac_16by16(int16 var1,  int16 var2, int32 L_add)
    {

        L_add += (int32)var1 * var2;
        int32 l_orig = L_add;
        if (__builtin_add_overflow( (int32)var1 * var2, l_orig, &L_add)) {
            // needs saturation
            if (l_orig > 0) L_add = MAX_32;
            else            L_add = MIN_32;
        }

        return L_add;
    }