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

Commit 957d7538 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "fillInputInfo: Guard against integer overflow."

parents 3982f0e9 a724230a
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -2426,7 +2426,15 @@ InputWindowInfo Layer::fillInputInfo() {
    xSurfaceInset = (xSurfaceInset >= 0) ? std::min(xSurfaceInset, layerBounds.getWidth() / 2) : 0;
    ySurfaceInset = (ySurfaceInset >= 0) ? std::min(ySurfaceInset, layerBounds.getHeight() / 2) : 0;

    layerBounds.inset(xSurfaceInset, ySurfaceInset, xSurfaceInset, ySurfaceInset);
    // inset while protecting from overflow TODO(b/161235021): What is going wrong
    // in the overflow scenario?
    {
    int32_t tmp;
    if (!__builtin_add_overflow(layerBounds.left, xSurfaceInset, &tmp)) layerBounds.left = tmp;
    if (!__builtin_sub_overflow(layerBounds.right, xSurfaceInset, &tmp)) layerBounds.right = tmp;
    if (!__builtin_add_overflow(layerBounds.top, ySurfaceInset, &tmp)) layerBounds.top = tmp;
    if (!__builtin_sub_overflow(layerBounds.bottom, ySurfaceInset, &tmp)) layerBounds.bottom = tmp;
    }

    // Input coordinate should match the layer bounds.
    info.frameLeft = layerBounds.left;