commit e69aac87d04a11d08df07a26dfd809b1478c27f6
author Ray Essick <essick@google.com> Thu Feb 04 10:23:59 2021 -0800
committer Ray Essick <essick@google.com> Fri Feb 05 05:41:26 2021 +0000
tree 42535ca735183eb2ba2162d33bcf9411331a4c75
parent 515608f34e5453757d0de8dfb65ca754685cf96f

Rephrase to avoid integer overflow

Bug: 179046129
Test: atest sf_foundation_test w/local additions
Change-Id: Ie86897fb6283b22745d2fc0cb9b9ea22736193a0
(cherry picked from commit 522b797958daedb6ff6a2b21b1a8e0dd3ec5bf5e)

media/libstagefright/foundation/ABuffer.cpp

diff --git a/media/libstagefright/foundation/ABuffer.cpp b/media/libstagefright/foundation/ABuffer.cpp
index c8965d9..c79384c 100644
--- a/media/libstagefright/foundation/ABuffer.cpp
+++ b/media/libstagefright/foundation/ABuffer.cpp
@@ -67,7 +67,7 @@
 
 void ABuffer::setRange(size_t offset, size_t size) {
     CHECK_LE(offset, mCapacity);
-    CHECK_LE(offset + size, mCapacity);
+    CHECK_LE(size, mCapacity - offset);
 
     mRangeOffset = offset;
     mRangeLength = size;