Fix ETC->DXT small mip transcode crash.

BUG=angleproject:1510 Change-Id: I42355607235a05fe276342084acd1eb359c16de4 Reviewed-on: https://chromium-review.googlesource.com/390414Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

Fix ETC->DXT small mip transcode crash.
5eeff0e4 · Minmin Gong · Commit Bot · b6fa043d · 5eeff0e4
Commit 5eeff0e4 authored Sep 27, 2016 by Minmin Gong Committed by Commit Bot Sep 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

loadimage_etc.cpp src/image_util/loadimage_etc.cpp +2 -2

No files found.
--- a/src/image_util/loadimage_etc.cpp
+++ b/src/image_util/loadimage_etc.cpp
@@ -891,10 +891,10 @@ struct ETC2Block
            std::swap(dxEnd, dyEnd);
        }
-        for (size_t j = dyBegin; j < dyEnd && (y + j) < h; j++)
+        for (size_t j = dyBegin; j < dyEnd; j++)
        {
            int *row = &pixelIndices[j * 4];
-            for (size_t i = dxBegin; i < dxEnd && (x + i) < w; i++)
+            for (size_t i = dxBegin; i < dxEnd; i++)
            {
                const size_t pixelIndex = subblockIdx * 4 + getIndex(i, j);
                row[i]                  = static_cast<int>(pixelIndex);