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

Commit 7ee0dba0 authored by Ivan Lozano's avatar Ivan Lozano
Browse files

Fix doFadingAnimationLocked in sanitized builds. 

The loop as constructed causes i to overflow twice when i = 0 on integer
overflow sanitized builds.

 runtime error: unsigned integer overflow: 0 - 1 cannot be represented
 in type 'size_t' (aka 'unsigned long')

 runtime error: unsigned integer overflow: 18446744073709551615 + 1
 cannot be represented in type 'size_t' (aka 'unsigned long')

This refactors the loop to avoid the overflows.

Bug: 30969751
Test: Compiles, device boots, enabled pointer location overlay.
Change-Id: I844bb3b84b1f536c50d06fb489fcc22590d4aa98
parent 53b2d749

libs/input/PointerController.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -551,18 +551,20 @@ bool PointerController::doFadingAnimationLocked(nsecs_t timestamp) { 
    }

    }





    // Animate spots that are fading out and being removed.

    // Animate spots that are fading out and being removed.

    for (size_t i = 0; i < mLocked.spots.size(); i++) {

    for (size_t i = 0; i < mLocked.spots.size();) {

        Spot* spot = mLocked.spots.itemAt(i);

        Spot* spot = mLocked.spots.itemAt(i);

        if (spot->id == Spot::INVALID_ID) {

        if (spot->id == Spot::INVALID_ID) {

            spot->alpha -= float(frameDelay) / SPOT_FADE_DURATION;

            spot->alpha -= float(frameDelay) / SPOT_FADE_DURATION;

            if (spot->alpha <= 0) {

            if (spot->alpha <= 0) {

                mLocked.spots.removeAt(i--);

                mLocked.spots.removeAt(i);

                releaseSpotLocked(spot);

                releaseSpotLocked(spot);

                continue;

            } else {

            } else {

                spot->sprite->setAlpha(spot->alpha);

                spot->sprite->setAlpha(spot->alpha);

                keepAnimating = true;

                keepAnimating = true;

            }

            }

        }

        }

        ++i;

    }

    }

    return keepAnimating;

    return keepAnimating;

}

}