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

Commit 0450452e authored by Mathias Agopian's avatar Mathias Agopian
Browse files

Make sure Region handles invalid rectangles 

the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.

Bug: 5331198, 5334829
Change-Id: Iee4e3b838ecf504ef21f7447fd2e34a56e7dc3f8
parent 000e95e7

libs/ui/Region.cpp

+5 −0
Original line number Diff line number Diff line
@@ -479,6 +479,11 @@ void Region::boolean_operation(int op, Region& dst, 
        const Region& lhs,

        const Rect& rhs, int dx, int dy)

{

    if (!rhs.isValid()) {

        LOGE("Region::boolean_operation(op=%d) invalid Rect={%d,%d,%d,%d}",

                op, rhs.left, rhs.top, rhs.right, rhs.bottom);

    }



#if VALIDATE_WITH_CORECG || VALIDATE_REGIONS

    boolean_operation(op, dst, lhs, Region(rhs), dx, dy);

#else