| commit | a4f859cd14083195b6b17c4a16c9074410325934 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Fri Mar 09 19:26:33 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 09 19:26:33 2018 +0000 |
| tree | 33042a3e6a07533c4c37c99162a78b97b86e3b3c | |
| parent | 0df1e8d08aeb50771bdae54f77088f31531c4cb0 [diff] | |
| parent | 237f9034c6cbe5cbafb0cd4c862d9dddfbdf7389 [diff] |
Handle overflow in android::HeifDataSource::readAt am: 237f9034c6 Change-Id: Idc655aa698903af90455f82b6aa665c6472872f5
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; }