commit 701167cfb9bf3e94ff2d8ebafb4eb9eff1f2e35e
author Ben Wagner <bungeman@google.com> Mon Oct 22 11:42:28 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 22 17:25:13 2018 +0000
tree 33fb643f43715bf257c3d59e9b8969eb8a910b14
parent 9e40e6fa796bc48f0015680ad70636667b2e8ace

Avoid potential overflow in assert.

Bug: chromium:897263
Change-Id: Ida49c4c325974b8a146df93c2c8d6870a1fce64d
Reviewed-on: https://skia-review.googlesource.com/c/164242
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Auto-Submit: Ben Wagner <bungeman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/codec/SkStreamBuffer.cpp

diff --git a/src/codec/SkStreamBuffer.cpp b/src/codec/SkStreamBuffer.cpp
index 00253fa..e8a6e90 100644
--- a/src/codec/SkStreamBuffer.cpp
+++ b/src/codec/SkStreamBuffer.cpp
@@ -72,7 +72,8 @@
         return sk_ref_sp<SkData>(*data);
     }
 
-    SkASSERT(position + length <= fStream->getLength());
+    SkASSERT(length <= fStream->getLength() &&
+             position <= fStream->getLength() - length);
 
     const size_t oldPosition = fStream->getPosition();
     if (!fStream->seek(position)) {