| commit | 89d3634ffe0855456fe4b33b6aa2abdffeeddfc6 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Fri Jun 26 00:25:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 26 00:25:15 2015 +0000 |
| tree | 210557bf3fb2725d4ce439908aff7aa325ad4565 | |
| parent | 1572820cd005c8b150c1c807b1b686d8f2da78ad [diff] | |
| parent | b36d9c3f00e75dba464ff62eab94dd46d93ac94e [diff] |
am b36d9c3f: Merge "More accurate checking for overlapped ranges." * commit 'b36d9c3f00e75dba464ff62eab94dd46d93ac94e': More accurate checking for overlapped ranges.
diff --git a/updater/blockimg.c b/updater/blockimg.c index fc35abe..0bd2559 100644 --- a/updater/blockimg.c +++ b/updater/blockimg.c
@@ -162,7 +162,7 @@ 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; } }