From c3dddce205ef44933813394013ee5ef89b63653b Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 25 Jun 2015 14:00:31 -0700 Subject: 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 c0f56ad76680df555689d4a2397487ef8c16b1a6) --- updater/blockimg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updater/blockimg.c b/updater/blockimg.c index e184800..1e95f4e 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c @@ -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; } } -- cgit v1.1