commit bbc5810582cb5cf9b9e093f1e6920d94c72dcc32
author Sungtak Lee <taklee@google.com> Fri Mar 09 22:04:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 09 22:04:38 2018 +0000
tree efe7c4841cd81aeafdebbb61bb5e34a55686effe
parent b9108baa01d2bbae57a804e46eea734c4fc3256f
parent 08ce69c929657887519fe3300ae13a4a1afbad8e

Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034c6" into pi-dev
am: 08ce69c929

Change-Id: I631141345bd39046c44f54fe12d55342790eb7cb

media/libheif/HeifDecoderImpl.cpp

diff --git a/media/libheif/HeifDecoderImpl.cpp b/media/libheif/HeifDecoderImpl.cpp
index 2dfbdca..63130c4 100644
--- a/media/libheif/HeifDecoderImpl.cpp
+++ b/media/libheif/HeifDecoderImpl.cpp
@@ -140,6 +140,11 @@
     // have been caught above.
     CHECK(offset >= mCachedOffset);
 
+    off64_t resultOffset;
+    if (__builtin_add_overflow(offset, size, &resultOffset)) {
+        return ERROR_IO;
+    }
+
     if (size == 0) {
         return 0;
     }