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

Commit c3dddce2 authored by Tao Bao's avatar Tao Bao
Browse files

More accurate checking for overlapped ranges. 

A RangeSet has half-closed half-open bounds. For example, "3,5" contains
blocks 3 and 4. So "3,5" and "5,7" are actually not overlapped.

Bug: 22098085
Change-Id: I362d259f8b5d62478858ad0422b635bc5068698d
(cherry picked from commit c0f56ad7)
parent cb9450e1

updater/blockimg.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int range_overlaps(RangeSet* r1, RangeSet* r2) { 
            r2_0 = r2->pos[j * 2];

            r2_1 = r2->pos[j * 2 + 1];



            if (!(r2_0 > r1_1 || r1_0 > r2_1)) {

            if (!(r2_0 >= r1_1 || r1_0 >= r2_1)) {

                return 1;

            }

        }