Commit 136be6af authored Mar 10, 2018 by Sungtak Lee Committed by android-build-merger Mar 10, 2018

Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034" into...

Merge "Handle overflow in android::HeifDataSource::readAt am: 237f9034" into pi-dev am: 08ce69c9
am: bbc58105

Change-Id: If7d8cb5dea6a420a7ef260d6ba2854cfadcd7af7

parents dbd5b53d bbc58105

media/libheif/HeifDecoderImpl.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,11 @@ ssize_t HeifDataSource::readAt(off64_t offset, size_t size) {
		// 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;
		}