Fix overflow in ImageIndexIterator::done.

The maxLayer() method was reading out of range for 2D arrays. BUG=644846,614178 BUG=angleproject:1493 Change-Id: I7cc4773d1ee9ff2d0a18cb0a8e916cf3687446db Reviewed-on: https://chromium-review.googlesource.com/382332 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

Fix overflow in ImageIndexIterator::done.
9df01f8a · Jamie Madill · Commit Bot · b6c3e77b · 9df01f8a
Commit 9df01f8a authored Sep 07, 2016 by Jamie Madill Committed by Commit Bot Sep 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

ImageIndex.cpp src/libANGLE/ImageIndex.cpp +6 -1

No files found.
--- a/src/libANGLE/ImageIndex.cpp
+++ b/src/libANGLE/ImageIndex.cpp
@@ -135,7 +135,12 @@ ImageIndexIterator::ImageIndexIterator(GLenum type, const Range<GLint> &mipRange
 GLint ImageIndexIterator::maxLayer() const
 {
-    return (mLayerCounts ? static_cast<GLint>(mLayerCounts[mCurrentMip]) : mLayerRange.end);
+    if (mLayerCounts)
+    {
+        ASSERT(mCurrentMip >= 0);
+        return (mCurrentMip < mMipRange.end) ? mLayerCounts[mCurrentMip] : 0;
+    }
+    return mLayerRange.end;
 }
 ImageIndex ImageIndexIterator::next()